Bug 24430 - Fold away const for array types

In C and C++ the qualifiers of a qualified array type apply to the
element type of said array.

In this particular problem report, GCC and Clang emit DWARF that
represent the qualifiers either on the array type, or on the element
type.  Quoting the test of the bug:

    Given the following example:

	struct test {
	  const char asdf[4];
	};

	void func(struct test arg) {}

    abidiff says:

     1 function with some indirect sub-type change:

       [C]'function void func(test)' at test.c:5:1 has some indirect sub-type
     changes:
	 parameter 1 of type 'struct test' has sub-type changes:
	   type size hasn't changed
	   1 data member change:
	    type of 'const char test::asdf[4]' changed:
	      entity changed from 'const char[4]' to 'const char[4] const'

This is because GCC represents the array as const array of const
signed char, whereas clang represents it as an array of const signed
char.

In this patch, libabigail's DWARF reader detects qualified array types
and appropriately qualifies the array element type, instead of
qualifying the array type.  The patch accordingly adjusts the various
regression tests and adds a new test which comes from the problem
report.

	* include/abg-fwd.h (is_array_of_qualified_element): Declare 2
	overloads of this function.
	(re_canonicalize): Declare a new function.
	* include/abg-ir.h (class {decl_base, type_base}): Declare
	re_canonicalize as a friend of these classes.
	* src/abg-dwarf-reader.cc (maybe_strip_qualification): Detect
	qualified array types and appropriately qualifies the array
	element type, instead of qualifying the array type itself.
	Re-canonicalize the resulting type if necessary.
	* src/abg-ir.cc (is_array_of_qualified_element): Define 2
	overloads of this function.
	(re_canonicalize): Define new function.
	* tests/data/Makefile.am: The two new test binary input files
	PR24430-fold-qualified-array-clang and
	PR24430-fold-qualified-array-gcc to source distribution, as well
	as the expected reference output.
	* tests/data/test-annotate/test15-pr18892.so.abi: Adjust.
	* tests/data/test-annotate/test17-pr19027.so.abi: Likewise.
	* tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise.
	* tests/data/test-annotate/test21-pr19092.so.abi: Likewise.
	* tests/data/test-diff-filter/PR24430-fold-qualified-array-clang:
	New binary test input coming from the bug report.
	* tests/data/test-diff-filter/PR24430-fold-qualified-array-gcc:
	Likewise.
	* tests/data/test-diff-filter/PR24430-fold-qualified-array-report-0.txt:
	Expected reference abi difference.
	* tests/data/test-diff-filter/test33-report-0.txt: Adjust.
	* tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt:
	Likewise.
	* tests/data/test-read-dwarf/PR22122-libftdc.so.abi: Likewise.
	* tests/data/test-read-dwarf/test12-pr18844.so.abi: Likewise.
	* tests/data/test-read-dwarf/test15-pr18892.so.abi: Likewise.
	* tests/data/test-read-dwarf/test17-pr19027.so.abi: Likewise.
	* tests/data/test-read-dwarf/test19-pr19023-libtcmalloc_and_profiler.so.abi:
	Likewise.
	* tests/data/test-read-dwarf/test21-pr19092.so.abi: Likewise.
	* tests/data/test-read-dwarf/test22-pr19097-libstdc++.so.6.0.17.so.abi:
	Likewise.
	* tests/test-diff-filter.cc: Add the new binary test input to this
	test harness.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>

diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index 969e25d..4625841 100644 (file)
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -655,6 +655,12 @@ is_array_type(const type_or_decl_base* decl);
 array_type_def_sptr
 is_array_type(const type_or_decl_base_sptr& decl);
 
+array_type_def_sptr
+is_array_of_qualified_element(type_base_sptr&);
+
+qualified_type_def_sptr
+is_array_of_qualified_element(const array_type_def_sptr&);
+
 void
 set_data_member_offset(var_decl_sptr, uint64_t);
 
@@ -1247,6 +1253,9 @@ type_or_void(const type_base_sptr, const environment*);
 type_base_sptr
 canonicalize(type_base_sptr);
 
+type_base_sptr
+re_canonicalize(type_base_sptr);
+
 type_base*
 type_has_non_canonicalized_subtype(type_base_sptr t);
 

diff --git a/include/abg-ir.h b/include/abg-ir.h
index 35791d0..4e4d60d 100644 (file)
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -1386,6 +1386,9 @@ public:
   friend type_base_sptr
   canonicalize(type_base_sptr);
 
+  friend type_base_sptr
+  re_canonicalize(type_base_sptr);
+
   friend bool
   equals(const decl_base&, const decl_base&, change_kind*);
 
@@ -1631,6 +1634,8 @@ public:
 
   friend type_base_sptr canonicalize(type_base_sptr);
 
+  friend type_base_sptr re_canonicalize(type_base_sptr);
+
   type_base_sptr
   get_canonical_type() const;
 
@@ -2206,6 +2211,9 @@ public:
   const type_base_sptr
   get_element_type() const;
 
+  void
+  set_element_type(const type_base_sptr& element_type);
+
   virtual void
   append_subrange(subrange_sptr sub);
 

diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index be327a8..d19849d 100644 (file)
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -14050,18 +14050,62 @@ maybe_strip_qualification(const qualified_type_def_sptr t)
 
   if (t->get_cv_quals() & qualified_type_def::CV_CONST
       && (is_reference_type(u)))
-    // Let's strip only the const qualifier.  To do that, the "const"
-    // qualified is turned into a no-op "none" qualified.
-    result.reset(new qualified_type_def
-                (u, t->get_cv_quals() & ~qualified_type_def::CV_CONST,
-                 t->get_location()));
+    {
+      // Let's strip only the const qualifier.  To do that, the "const"
+      // qualified is turned into a no-op "none" qualified.
+      result.reset(new qualified_type_def
+                  (u, t->get_cv_quals() & ~qualified_type_def::CV_CONST,
+                   t->get_location()));
+    }
   else if (t->get_cv_quals() & qualified_type_def::CV_CONST
           && env->is_void_type(u))
-    // So this type is a "const void".  Let's strip the "const"
-    // qualifier out and make this just be "void", so that a "const
-    // void" type and a "void" type compare equal after going through
-    // this function.
-    result = is_decl(u);
+    {
+      // So this type is a "const void".  Let's strip the "const"
+      // qualifier out and make this just be "void", so that a "const
+      // void" type and a "void" type compare equal after going through
+      // this function.
+      result = is_decl(u);
+    }
+  else if (is_array_of_qualified_element(u))
+    {
+      // In C and C++, a cv qualifiers of a qualified array apply to
+      // the array element type.  So the qualifiers of the array can
+      // be dropped and applied to the element type.
+      //
+      // Here, the element type is qualified already.  So apply the
+      // qualifiers of the array itself to the already qualified
+      // element type and drop the array qualifiers.
+      array_type_def_sptr array = is_array_type(u);
+      qualified_type_def_sptr element_type =
+       is_qualified_type(array->get_element_type());
+      qualified_type_def::CV quals = element_type->get_cv_quals();
+      quals |= t->get_cv_quals();
+      element_type->set_cv_quals(quals);
+      result = is_decl(u);
+      if (u->get_canonical_type())
+       re_canonicalize(u);
+    }
+  else if (is_array_type(u) && !is_array_of_qualified_element(is_array_type(u)))
+    {
+      // In C and C++, a cv qualifiers of a qualified array apply to
+      // the array element type.  So the qualifiers of the array can
+      // be dropped and applied to the element type.
+      //
+      // Here, the element type is not qualified.  So apply the
+      // qualifiers of the array itself to the element type and drop
+      // the array qualifiers.
+      array_type_def_sptr array = is_array_type(u);
+      type_base_sptr element_type = array->get_element_type();
+      qualified_type_def_sptr qual_type
+       (new qualified_type_def(element_type,
+                               t->get_cv_quals(),
+                               t->get_location()));
+      add_decl_to_scope(qual_type, is_decl(element_type)->get_scope());
+      array->set_element_type(qual_type);
+      result = is_decl(u);
+      if (u->get_canonical_type())
+       re_canonicalize(u);
+    }
 
   return result;
 }

diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 96adc58..1a6aed7 100644 (file)
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -7314,6 +7314,37 @@ array_type_def_sptr
 is_array_type(const type_or_decl_base_sptr& type)
 {return dynamic_pointer_cast<array_type_def>(type);}
 
+/// Tests if the element of a given array is a qualified type.
+///
+/// @param array the array type to consider.
+///
+/// @return the qualified element of the array iff it's a qualified
+/// type.  Otherwise, return a nil object.
+qualified_type_def_sptr
+is_array_of_qualified_element(const array_type_def_sptr& array)
+{
+  if (!array)
+    return qualified_type_def_sptr();
+
+  return is_qualified_type(array->get_element_type());
+}
+
+/// Test if an array type is an array to a qualified element type.
+///
+/// @param type the array type to consider.
+///
+/// @return true the array @p type iff it's an array to a qualified
+/// element type.
+array_type_def_sptr
+is_array_of_qualified_element(type_base_sptr& type)
+{
+  if (array_type_def_sptr array = is_array_type(type))
+    if (is_array_of_qualified_element(array))
+      return array;
+
+  return array_type_def_sptr();
+}
+
 /// Test if a type is an array_type_def::subrange_type.
 ///
 /// @param type the type to consider.
@@ -10702,6 +10733,22 @@ canonicalize(type_base_sptr t)
   return canonical;
 }
 
+/// Re-compute the canonical type of a type which already has one.
+///
+/// This does what @ref canonicalize does, but clears out the
+/// previously computed canonical type first.
+///
+/// @param t the type to compute the canonical type for.
+///
+/// @return the newly computed canonical type.
+type_base_sptr
+re_canonicalize(type_base_sptr t)
+{
+  t->priv_->canonical_type.reset();
+  t->priv_->naked_canonical_type = 0;
+  return canonicalize(t);
+}
+
 /// The constructor of @ref type_base.
 ///
 /// @param s the size of the type, in bits.
@@ -13361,6 +13408,19 @@ array_type_def::get_element_type() const
   return type_base_sptr(priv_->element_type_);
 }
 
+/// Setter of the type of array element.
+///
+/// Beware that after using this function, one might want to
+/// re-compute the canonical type of the array, if one has already
+/// been computed.
+///
+/// @param element_type the new element type to set.
+void
+array_type_def::set_element_type(const type_base_sptr& element_type)
+{
+  priv_->element_type_ = element_type;
+}
+
 // Append a single subrange @param sub.
 void
 array_type_def::append_subrange(subrange_sptr sub)

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index ab44744..c2d6a6c 100644 (file)
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -689,6 +689,9 @@ test-diff-filter/test47-filter-void-ptr-change-v0.c \
 test-diff-filter/test47-filter-void-ptr-change-v1.c \
 test-diff-filter/test47-filter-void-ptr-change-v0.o \
 test-diff-filter/test47-filter-void-ptr-change-v1.o \
+test-diff-filter/PR24430-fold-qualified-array-clang \
+test-diff-filter/PR24430-fold-qualified-array-gcc \
+test-diff-filter/PR24430-fold-qualified-array-report-0.txt \
 \
 test-diff-suppr/test0-type-suppr-v0.cc \
 test-diff-suppr/test0-type-suppr-v1.cc \

diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi
index d7fb91f..f10984c 100644 (file)
--- a/tests/data/test-annotate/test15-pr18892.so.abi
+++ b/tests/data/test-annotate/test15-pr18892.so.abi
@@ -41171,27 +41171,27 @@
       <return type-id='type-id-1750'/>
     </function-decl>
 
-    <!-- demangle_operator_info[62] -->
-    <array-type-def dimensions='1' type-id='type-id-1746' size-in-bits='11904' id='type-id-1760'>
+    <!-- const demangle_operator_info[62] -->
+    <array-type-def dimensions='1' type-id='type-id-1760' size-in-bits='11904' id='type-id-1761'>
       <!-- <anonymous range>[62] -->
-      <subrange length='62' type-id='type-id-28' id='type-id-1761'/>
+      <subrange length='62' type-id='type-id-28' id='type-id-1762'/>
 
     </array-type-def>
-    <!-- demangle_operator_info[62] const -->
-    <qualified-type-def type-id='type-id-1760' const='yes' id='type-id-1762'/>
-    <!-- demangle_operator_info[62] const __asan_cplus_demangle_operators -->
-    <var-decl name='__asan_cplus_demangle_operators' type-id='type-id-1762' mangled-name='__asan_cplus_demangle_operators' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='1688' column='1' elf-symbol-id='__asan_cplus_demangle_operators'/>
+    <!-- const demangle_operator_info -->
+    <qualified-type-def type-id='type-id-1746' const='yes' id='type-id-1760'/>
+    <!-- const demangle_operator_info __asan_cplus_demangle_operators[62] -->
+    <var-decl name='__asan_cplus_demangle_operators' type-id='type-id-1761' mangled-name='__asan_cplus_demangle_operators' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='1688' column='1' elf-symbol-id='__asan_cplus_demangle_operators'/>
 
-    <!-- demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-1752' size-in-bits='8448' id='type-id-1763'>
+    <!-- const demangle_builtin_type_info[33] -->
+    <array-type-def dimensions='1' type-id='type-id-1763' size-in-bits='8448' id='type-id-1764'>
       <!-- <anonymous range>[33] -->
-      <subrange length='33' type-id='type-id-28' id='type-id-1764'/>
+      <subrange length='33' type-id='type-id-28' id='type-id-1765'/>
 
     </array-type-def>
-    <!-- demangle_builtin_type_info[33] const -->
-    <qualified-type-def type-id='type-id-1763' const='yes' id='type-id-1765'/>
-    <!-- demangle_builtin_type_info[33] const __asan_cplus_demangle_builtin_types -->
-    <var-decl name='__asan_cplus_demangle_builtin_types' type-id='type-id-1765' mangled-name='__asan_cplus_demangle_builtin_types' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='2188' column='1' elf-symbol-id='__asan_cplus_demangle_builtin_types'/>
+    <!-- const demangle_builtin_type_info -->
+    <qualified-type-def type-id='type-id-1752' const='yes' id='type-id-1763'/>
+    <!-- const demangle_builtin_type_info __asan_cplus_demangle_builtin_types[33] -->
+    <var-decl name='__asan_cplus_demangle_builtin_types' type-id='type-id-1764' mangled-name='__asan_cplus_demangle_builtin_types' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='2188' column='1' elf-symbol-id='__asan_cplus_demangle_builtin_types'/>
     <!-- void free(void*) -->
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->

diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi
index c7871ad..13ed7e4 100644 (file)
--- a/tests/data/test-annotate/test17-pr19027.so.abi
+++ b/tests/data/test-annotate/test17-pr19027.so.abi
@@ -1276,6 +1276,8 @@
       <!-- hb_blob_t* -->
       <return type-id='type-id-59'/>
     </function-decl>
+    <!-- const char -->
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-62'/>
     <!-- void (void*) -->
     <function-type size-in-bits='64' id='type-id-30'>
       <!-- parameter of type 'void*' -->
@@ -1286,14 +1288,14 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-63'/>
     <!-- const char** hb_buffer_serialize_list_formats() -->
     <function-decl name='hb_buffer_serialize_list_formats' mangled-name='hb_buffer_serialize_list_formats' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_list_formats'>
       <!-- const char** -->
-      <return type-id='type-id-62'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <!-- enum hb_buffer_serialize_format_t -->
-    <enum-decl name='hb_buffer_serialize_format_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='305' column='1' id='type-id-63'>
+    <enum-decl name='hb_buffer_serialize_format_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='305' column='1' id='type-id-64'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FORMAT_TEXT' value='1413830740'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FORMAT_JSON' value='1246973774'/>
@@ -1302,15 +1304,15 @@
     <!-- const char* hb_buffer_serialize_format_to_string(hb_buffer_serialize_format_t) -->
     <function-decl name='hb_buffer_serialize_format_to_string' mangled-name='hb_buffer_serialize_format_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_format_to_string'>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
-      <parameter type-id='type-id-63' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='80' column='1'/>
+      <parameter type-id='type-id-64' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='80' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-50'/>
     </function-decl>
     <!-- struct hb_buffer_t -->
-    <class-decl name='hb_buffer_t' size-in-bits='2752' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='46' column='1' id='type-id-64'>
+    <class-decl name='hb_buffer_t' size-in-bits='2752' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='46' column='1' id='type-id-65'>
       <member-type access='public'>
         <!-- typedef long int hb_buffer_t::scratch_buffer_t -->
-        <typedef-decl name='scratch_buffer_t' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-65'/>
+        <typedef-decl name='scratch_buffer_t' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-66'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_buffer_t::header -->
@@ -1318,23 +1320,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- hb_unicode_funcs_t* hb_buffer_t::unicode -->
-        <var-decl name='unicode' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='51' column='1'/>
+        <var-decl name='unicode' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_buffer_flags_t hb_buffer_t::flags -->
-        <var-decl name='flags' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='52' column='1'/>
+        <var-decl name='flags' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
         <!-- hb_codepoint_t hb_buffer_t::replacement -->
-        <var-decl name='replacement' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='53' column='1'/>
+        <var-decl name='replacement' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- hb_buffer_content_type_t hb_buffer_t::content_type -->
-        <var-decl name='content_type' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='56' column='1'/>
+        <var-decl name='content_type' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- hb_segment_properties_t hb_buffer_t::props -->
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='57' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- bool hb_buffer_t::in_error -->
@@ -1366,15 +1368,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- hb_glyph_info_t* hb_buffer_t::info -->
-        <var-decl name='info' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='68' column='1'/>
+        <var-decl name='info' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- hb_glyph_info_t* hb_buffer_t::out_info -->
-        <var-decl name='out_info' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='69' column='1'/>
+        <var-decl name='out_info' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
         <!-- hb_glyph_position_t* hb_buffer_t::pos -->
-        <var-decl name='pos' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='70' column='1'/>
+        <var-decl name='pos' type-id='type-id-73' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <!-- unsigned int hb_buffer_t::serial -->
@@ -1382,29 +1384,29 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1760'>
         <!-- uint8_t hb_buffer_t::allocated_var_bytes[8] -->
-        <var-decl name='allocated_var_bytes' type-id='type-id-73' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='86' column='1'/>
+        <var-decl name='allocated_var_bytes' type-id='type-id-74' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
         <!-- const char* hb_buffer_t::allocated_var_owner[8] -->
-        <var-decl name='allocated_var_owner' type-id='type-id-74' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='87' column='1'/>
+        <var-decl name='allocated_var_owner' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='87' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_buffer_t::CONTEXT_LENGTH -->
-        <var-decl name='CONTEXT_LENGTH' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='92' column='1'/>
+        <var-decl name='CONTEXT_LENGTH' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- hb_codepoint_t hb_buffer_t::context[2][5] -->
-        <var-decl name='context' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='93' column='1'/>
+        <var-decl name='context' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
         <!-- unsigned int hb_buffer_t::context_len[2] -->
-        <var-decl name='context_len' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='94' column='1'/>
+        <var-decl name='context_len' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='94' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_buffer_t::_static_assertion_on_line_48() -->
         <function-decl name='_static_assertion_on_line_48' mangled-name='_ZNK11hb_buffer_t28_static_assertion_on_line_48Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1413,69 +1415,69 @@
         <!-- hb_glyph_info_t& hb_buffer_t::cur(unsigned int) -->
         <function-decl name='cur' mangled-name='_ZN11hb_buffer_t3curEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- hb_glyph_info_t& -->
-          <return type-id='type-id-80'/>
+          <return type-id='type-id-81'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_glyph_info_t hb_buffer_t::cur(unsigned int) -->
         <function-decl name='cur' mangled-name='_ZNK11hb_buffer_t3curEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- typedef hb_glyph_info_t -->
-          <return type-id='type-id-81'/>
+          <return type-id='type-id-82'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_glyph_position_t& hb_buffer_t::cur_pos(unsigned int) -->
         <function-decl name='cur_pos' mangled-name='_ZN11hb_buffer_t7cur_posEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- hb_glyph_position_t& -->
-          <return type-id='type-id-82'/>
+          <return type-id='type-id-83'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_glyph_position_t hb_buffer_t::cur_pos(unsigned int) -->
         <function-decl name='cur_pos' mangled-name='_ZNK11hb_buffer_t7cur_posEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- typedef hb_glyph_position_t -->
-          <return type-id='type-id-83'/>
+          <return type-id='type-id-84'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_glyph_info_t& hb_buffer_t::prev() -->
         <function-decl name='prev' mangled-name='_ZN11hb_buffer_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- hb_glyph_info_t& -->
-          <return type-id='type-id-80'/>
+          <return type-id='type-id-81'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_glyph_info_t hb_buffer_t::prev() -->
         <function-decl name='prev' mangled-name='_ZNK11hb_buffer_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- typedef hb_glyph_info_t -->
-          <return type-id='type-id-81'/>
+          <return type-id='type-id-82'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- bool hb_buffer_t::has_separate_output() -->
         <function-decl name='has_separate_output' mangled-name='_ZNK11hb_buffer_t19has_separate_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -1484,7 +1486,7 @@
         <!-- void hb_buffer_t::reset() -->
         <function-decl name='reset' mangled-name='_ZN11hb_buffer_t5resetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1493,7 +1495,7 @@
         <!-- void hb_buffer_t::clear() -->
         <function-decl name='clear' mangled-name='_ZN11hb_buffer_t5clearEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1502,7 +1504,7 @@
         <!-- unsigned int hb_buffer_t::backtrack_len() -->
         <function-decl name='backtrack_len' mangled-name='_ZNK11hb_buffer_t13backtrack_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -1511,7 +1513,7 @@
         <!-- unsigned int hb_buffer_t::lookahead_len() -->
         <function-decl name='lookahead_len' mangled-name='_ZNK11hb_buffer_t13lookahead_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_buffer_t*' -->
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -1520,7 +1522,7 @@
         <!-- unsigned int hb_buffer_t::next_serial() -->
         <function-decl name='next_serial' mangled-name='_ZN11hb_buffer_t11next_serialEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -1529,7 +1531,7 @@
         <!-- void hb_buffer_t::allocate_var(unsigned int, unsigned int, const char*) -->
         <function-decl name='allocate_var' mangled-name='_ZN11hb_buffer_t12allocate_varEjjPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1544,7 +1546,7 @@
         <!-- void hb_buffer_t::deallocate_var(unsigned int, unsigned int, const char*) -->
         <function-decl name='deallocate_var' mangled-name='_ZN11hb_buffer_t14deallocate_varEjjPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1559,7 +1561,7 @@
         <!-- void hb_buffer_t::assert_var(unsigned int, unsigned int, const char*) -->
         <function-decl name='assert_var' mangled-name='_ZN11hb_buffer_t10assert_varEjjPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1574,7 +1576,7 @@
         <!-- void hb_buffer_t::deallocate_var_all() -->
         <function-decl name='deallocate_var_all' mangled-name='_ZN11hb_buffer_t18deallocate_var_allEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1583,9 +1585,9 @@
         <!-- void hb_buffer_t::add(hb_codepoint_t, unsigned int) -->
         <function-decl name='add' mangled-name='_ZN11hb_buffer_t3addEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- void -->
@@ -1596,9 +1598,9 @@
         <!-- void hb_buffer_t::add_info(const hb_glyph_info_t&) -->
         <function-decl name='add_info' mangled-name='_ZN11hb_buffer_t8add_infoERK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'const hb_glyph_info_t&' -->
-          <parameter type-id='type-id-84'/>
+          <parameter type-id='type-id-85'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1607,7 +1609,7 @@
         <!-- void hb_buffer_t::reverse_range(unsigned int, unsigned int) -->
         <function-decl name='reverse_range' mangled-name='_ZN11hb_buffer_t13reverse_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1620,7 +1622,7 @@
         <!-- void hb_buffer_t::reverse() -->
         <function-decl name='reverse' mangled-name='_ZN11hb_buffer_t7reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1629,7 +1631,7 @@
         <!-- void hb_buffer_t::reverse_clusters() -->
         <function-decl name='reverse_clusters' mangled-name='_ZN11hb_buffer_t16reverse_clustersEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1638,7 +1640,7 @@
         <!-- void hb_buffer_t::guess_segment_properties() -->
         <function-decl name='guess_segment_properties' mangled-name='_ZN11hb_buffer_t24guess_segment_propertiesEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1647,7 +1649,7 @@
         <!-- void hb_buffer_t::swap_buffers() -->
         <function-decl name='swap_buffers' mangled-name='_ZN11hb_buffer_t12swap_buffersEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1656,7 +1658,7 @@
         <!-- void hb_buffer_t::remove_output() -->
         <function-decl name='remove_output' mangled-name='_ZN11hb_buffer_t13remove_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1665,7 +1667,7 @@
         <!-- void hb_buffer_t::clear_output() -->
         <function-decl name='clear_output' mangled-name='_ZN11hb_buffer_t12clear_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1674,7 +1676,7 @@
         <!-- void hb_buffer_t::clear_positions() -->
         <function-decl name='clear_positions' mangled-name='_ZN11hb_buffer_t15clear_positionsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1683,13 +1685,13 @@
         <!-- void hb_buffer_t::replace_glyphs(unsigned int, unsigned int, const hb_codepoint_t*) -->
         <function-decl name='replace_glyphs' mangled-name='_ZN11hb_buffer_t14replace_glyphsEjjPKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'const hb_codepoint_t*' -->
-          <parameter type-id='type-id-85'/>
+          <parameter type-id='type-id-86'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1698,9 +1700,9 @@
         <!-- void hb_buffer_t::replace_glyph(hb_codepoint_t) -->
         <function-decl name='replace_glyph' mangled-name='_ZN11hb_buffer_t13replace_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1709,9 +1711,9 @@
         <!-- void hb_buffer_t::output_glyph(hb_codepoint_t) -->
         <function-decl name='output_glyph' mangled-name='_ZN11hb_buffer_t12output_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1720,9 +1722,9 @@
         <!-- void hb_buffer_t::output_info(const hb_glyph_info_t&) -->
         <function-decl name='output_info' mangled-name='_ZN11hb_buffer_t11output_infoERK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'const hb_glyph_info_t&' -->
-          <parameter type-id='type-id-84'/>
+          <parameter type-id='type-id-85'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1731,7 +1733,7 @@
         <!-- void hb_buffer_t::copy_glyph() -->
         <function-decl name='copy_glyph' mangled-name='_ZN11hb_buffer_t10copy_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1740,7 +1742,7 @@
         <!-- bool hb_buffer_t::move_to(unsigned int) -->
         <function-decl name='move_to' mangled-name='_ZN11hb_buffer_t7move_toEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- bool -->
@@ -1751,7 +1753,7 @@
         <!-- void hb_buffer_t::next_glyph() -->
         <function-decl name='next_glyph' mangled-name='_ZN11hb_buffer_t10next_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1760,7 +1762,7 @@
         <!-- void hb_buffer_t::skip_glyph() -->
         <function-decl name='skip_glyph' mangled-name='_ZN11hb_buffer_t10skip_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1769,9 +1771,9 @@
         <!-- void hb_buffer_t::reset_masks(hb_mask_t) -->
         <function-decl name='reset_masks' mangled-name='_ZN11hb_buffer_t11reset_masksEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_mask_t' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1780,9 +1782,9 @@
         <!-- void hb_buffer_t::add_masks(hb_mask_t) -->
         <function-decl name='add_masks' mangled-name='_ZN11hb_buffer_t9add_masksEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_mask_t' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -1791,11 +1793,11 @@
         <!-- void hb_buffer_t::set_masks(hb_mask_t, hb_mask_t, unsigned int, unsigned int) -->
         <function-decl name='set_masks' mangled-name='_ZN11hb_buffer_t9set_masksEjjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_mask_t' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- parameter of type 'typedef hb_mask_t' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1808,7 +1810,7 @@
         <!-- void hb_buffer_t::merge_clusters(unsigned int, unsigned int) -->
         <function-decl name='merge_clusters' mangled-name='_ZN11hb_buffer_t14merge_clustersEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1821,7 +1823,7 @@
         <!-- void hb_buffer_t::merge_out_clusters(unsigned int, unsigned int) -->
         <function-decl name='merge_out_clusters' mangled-name='_ZN11hb_buffer_t18merge_out_clustersEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1834,7 +1836,7 @@
         <!-- bool hb_buffer_t::enlarge(unsigned int) -->
         <function-decl name='enlarge' mangled-name='_ZN11hb_buffer_t7enlargeEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- bool -->
@@ -1845,7 +1847,7 @@
         <!-- bool hb_buffer_t::ensure(unsigned int) -->
         <function-decl name='ensure' mangled-name='_ZN11hb_buffer_t6ensureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- bool -->
@@ -1856,7 +1858,7 @@
         <!-- bool hb_buffer_t::ensure_inplace(unsigned int) -->
         <function-decl name='ensure_inplace' mangled-name='_ZN11hb_buffer_t14ensure_inplaceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- bool -->
@@ -1867,7 +1869,7 @@
         <!-- bool hb_buffer_t::make_room_for(unsigned int, unsigned int) -->
         <function-decl name='make_room_for' mangled-name='_ZN11hb_buffer_t13make_room_forEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
@@ -1880,7 +1882,7 @@
         <!-- bool hb_buffer_t::shift_forward(unsigned int) -->
         <function-decl name='shift_forward' mangled-name='_ZN11hb_buffer_t13shift_forwardEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- bool -->
@@ -1891,18 +1893,18 @@
         <!-- hb_buffer_t::scratch_buffer_t* hb_buffer_t::get_scratch_buffer(unsigned int*) -->
         <function-decl name='get_scratch_buffer' mangled-name='_ZN11hb_buffer_t18get_scratch_bufferEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-60'/>
           <!-- hb_buffer_t::scratch_buffer_t* -->
-          <return type-id='type-id-87'/>
+          <return type-id='type-id-88'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_buffer_t::clear_context(unsigned int) -->
         <function-decl name='clear_context' mangled-name='_ZN11hb_buffer_t13clear_contextEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- void -->
@@ -1911,47 +1913,47 @@
       </member-function>
     </class-decl>
     <!-- struct hb_unicode_funcs_t -->
-    <class-decl name='hb_unicode_funcs_t' size-in-bits='2560' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='64' column='1' id='type-id-88'>
+    <class-decl name='hb_unicode_funcs_t' size-in-bits='2560' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='64' column='1' id='type-id-89'>
       <member-type access='public'>
         <!-- struct {hb_unicode_combining_class_func_t combining_class; hb_unicode_eastasian_width_func_t eastasian_width; hb_unicode_general_category_func_t general_category; hb_unicode_mirroring_func_t mirroring; hb_unicode_script_func_t script; hb_unicode_compose_func_t compose; hb_unicode_decompose_func_t decompose; hb_unicode_decompose_compatibility_func_t decompose_compatibility;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='203' column='1' id='type-id-89'>
+        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='203' column='1' id='type-id-90'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_unicode_combining_class_func_t combining_class -->
-            <var-decl name='combining_class' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='combining_class' type-id='type-id-91' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- hb_unicode_eastasian_width_func_t eastasian_width -->
-            <var-decl name='eastasian_width' type-id='type-id-91' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='eastasian_width' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- hb_unicode_general_category_func_t general_category -->
-            <var-decl name='general_category' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='general_category' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- hb_unicode_mirroring_func_t mirroring -->
-            <var-decl name='mirroring' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='mirroring' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
             <!-- hb_unicode_script_func_t script -->
-            <var-decl name='script' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='script' type-id='type-id-95' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
             <!-- hb_unicode_compose_func_t compose -->
-            <var-decl name='compose' type-id='type-id-95' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='compose' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='384'>
             <!-- hb_unicode_decompose_func_t decompose -->
-            <var-decl name='decompose' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='decompose' type-id='type-id-97' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='448'>
             <!-- hb_unicode_decompose_compatibility_func_t decompose_compatibility -->
-            <var-decl name='decompose_compatibility' type-id='type-id-97' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='decompose_compatibility' type-id='type-id-98' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='public'>
         <!-- struct {void* combining_class; void* eastasian_width; void* general_category; void* mirroring; void* script; void* compose; void* decompose; void* decompose_compatibility;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='209' column='1' id='type-id-98'>
+        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='209' column='1' id='type-id-99'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- void* combining_class -->
             <var-decl name='combining_class' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='211' column='1'/>
@@ -1988,7 +1990,7 @@
       </member-type>
       <member-type access='public'>
         <!-- struct {hb_destroy_func_t combining_class; hb_destroy_func_t eastasian_width; hb_destroy_func_t general_category; hb_destroy_func_t mirroring; hb_destroy_func_t script; hb_destroy_func_t compose; hb_destroy_func_t decompose; hb_destroy_func_t decompose_compatibility;} -->
-        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='215' column='1' id='type-id-99'>
+        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='215' column='1' id='type-id-100'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- hb_destroy_func_t combining_class -->
             <var-decl name='combining_class' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='217' column='1'/>
@@ -2029,7 +2031,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- hb_unicode_funcs_t* hb_unicode_funcs_t::parent -->
-        <var-decl name='parent' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='68' column='1'/>
+        <var-decl name='parent' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- bool hb_unicode_funcs_t::immutable -->
@@ -2037,21 +2039,21 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- struct {hb_unicode_combining_class_func_t combining_class; hb_unicode_eastasian_width_func_t eastasian_width; hb_unicode_general_category_func_t general_category; hb_unicode_mirroring_func_t mirroring; hb_unicode_script_func_t script; hb_unicode_compose_func_t compose; hb_unicode_decompose_func_t decompose; hb_unicode_decompose_compatibility_func_t decompose_compatibility;} hb_unicode_funcs_t::func -->
-        <var-decl name='func' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='207' column='1'/>
+        <var-decl name='func' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- struct {void* combining_class; void* eastasian_width; void* general_category; void* mirroring; void* script; void* compose; void* decompose; void* decompose_compatibility;} hb_unicode_funcs_t::user_data -->
-        <var-decl name='user_data' type-id='type-id-98' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='213' column='1'/>
+        <var-decl name='user_data' type-id='type-id-99' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
         <!-- struct {hb_destroy_func_t combining_class; hb_destroy_func_t eastasian_width; hb_destroy_func_t general_category; hb_destroy_func_t mirroring; hb_destroy_func_t script; hb_destroy_func_t compose; hb_destroy_func_t decompose; hb_destroy_func_t decompose_compatibility;} hb_unicode_funcs_t::destroy -->
-        <var-decl name='destroy' type-id='type-id-99' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='219' column='1'/>
+        <var-decl name='destroy' type-id='type-id-100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='219' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_unicode_funcs_t::_static_assertion_on_line_66() -->
         <function-decl name='_static_assertion_on_line_66' mangled-name='_ZNK18hb_unicode_funcs_t28_static_assertion_on_line_66Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-100' is-artificial='yes'/>
+          <parameter type-id='type-id-101' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -2060,20 +2062,20 @@
         <!-- hb_unicode_combining_class_t hb_unicode_funcs_t::combining_class(hb_codepoint_t) -->
         <function-decl name='combining_class' mangled-name='_ZN18hb_unicode_funcs_t15combining_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- enum hb_unicode_combining_class_t -->
-          <return type-id='type-id-101'/>
+          <return type-id='type-id-102'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- unsigned int hb_unicode_funcs_t::eastasian_width(hb_codepoint_t) -->
         <function-decl name='eastasian_width' mangled-name='_ZN18hb_unicode_funcs_t15eastasian_widthEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -2082,46 +2084,46 @@
         <!-- hb_unicode_general_category_t hb_unicode_funcs_t::general_category(hb_codepoint_t) -->
         <function-decl name='general_category' mangled-name='_ZN18hb_unicode_funcs_t16general_categoryEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- enum hb_unicode_general_category_t -->
-          <return type-id='type-id-102'/>
+          <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_codepoint_t hb_unicode_funcs_t::mirroring(hb_codepoint_t) -->
         <function-decl name='mirroring' mangled-name='_ZN18hb_unicode_funcs_t9mirroringEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_codepoint_t -->
-          <return type-id='type-id-68'/>
+          <return type-id='type-id-69'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_script_t hb_unicode_funcs_t::script(hb_codepoint_t) -->
         <function-decl name='script' mangled-name='_ZN18hb_unicode_funcs_t6scriptEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- enum hb_script_t -->
-          <return type-id='type-id-103'/>
+          <return type-id='type-id-104'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_bool_t hb_unicode_funcs_t::compose(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <function-decl name='compose' mangled-name='_ZN18hb_unicode_funcs_t7composeEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2130,13 +2132,13 @@
         <!-- hb_bool_t hb_unicode_funcs_t::decompose(hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
         <function-decl name='decompose' mangled-name='_ZN18hb_unicode_funcs_t9decomposeEjPjS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2145,11 +2147,11 @@
         <!-- unsigned int hb_unicode_funcs_t::decompose_compatibility(hb_codepoint_t, hb_codepoint_t*) -->
         <function-decl name='decompose_compatibility' mangled-name='_ZN18hb_unicode_funcs_t23decompose_compatibilityEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -2158,9 +2160,9 @@
         <!-- unsigned int hb_unicode_funcs_t::modified_combining_class(hb_codepoint_t) -->
         <function-decl name='modified_combining_class' mangled-name='_ZN18hb_unicode_funcs_t24modified_combining_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_unicode_funcs_t*' -->
-          <parameter type-id='type-id-66' is-artificial='yes'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -2169,7 +2171,7 @@
         <!-- hb_bool_t hb_unicode_funcs_t::is_variation_selector() -->
         <function-decl name='is_variation_selector' mangled-name='_ZN18hb_unicode_funcs_t21is_variation_selectorEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2178,14 +2180,14 @@
         <!-- hb_bool_t hb_unicode_funcs_t::is_default_ignorable() -->
         <function-decl name='is_default_ignorable' mangled-name='_ZN18hb_unicode_funcs_t20is_default_ignorableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- enum hb_unicode_combining_class_t -->
-    <enum-decl name='hb_unicode_combining_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='87' column='1' id='type-id-101'>
+    <enum-decl name='hb_unicode_combining_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='87' column='1' id='type-id-102'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_UNICODE_COMBINING_CLASS_NOT_REORDERED' value='0'/>
       <enumerator name='HB_UNICODE_COMBINING_CLASS_OVERLAY' value='1'/>
@@ -2246,23 +2248,23 @@
       <enumerator name='HB_UNICODE_COMBINING_CLASS_INVALID' value='255'/>
     </enum-decl>
     <!-- typedef hb_unicode_funcs_t hb_unicode_funcs_t -->
-    <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-105'/>
+    <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-89' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-106'/>
     <!-- hb_unicode_funcs_t* -->
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-66'/>
+    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-67'/>
     <!-- typedef unsigned int uint32_t -->
-    <typedef-decl name='uint32_t' type-id='type-id-10' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-106'/>
+    <typedef-decl name='uint32_t' type-id='type-id-10' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-107'/>
     <!-- typedef uint32_t hb_codepoint_t -->
-    <typedef-decl name='hb_codepoint_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-68'/>
+    <typedef-decl name='hb_codepoint_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-69'/>
     <!-- enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
+    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
     <!-- typedef enum hb_unicode_combining_class_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_combining_class_func_t -->
-    <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-90'/>
+    <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-109' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-91'/>
     <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-110'/>
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-111'/>
     <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_eastasian_width_func_t -->
-    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-110' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-91'/>
+    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-111' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-92'/>
     <!-- enum hb_unicode_general_category_t -->
-    <enum-decl name='hb_unicode_general_category_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='46' column='1' id='type-id-102'>
+    <enum-decl name='hb_unicode_general_category_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='46' column='1' id='type-id-103'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_CONTROL' value='0'/>
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_FORMAT' value='1'/>
@@ -2296,15 +2298,15 @@
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR' value='29'/>
     </enum-decl>
     <!-- enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
     <!-- typedef enum hb_unicode_general_category_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_general_category_func_t -->
-    <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-112' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-92'/>
+    <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-113' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-93'/>
     <!-- typedef hb_codepoint_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
     <!-- typedef typedef hb_codepoint_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_mirroring_func_t -->
-    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-114' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-93'/>
+    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-115' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-94'/>
     <!-- enum hb_script_t -->
-    <enum-decl name='hb_script_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='157' column='1' id='type-id-103'>
+    <enum-decl name='hb_script_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='157' column='1' id='type-id-104'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_SCRIPT_COMMON' value='1517910393'/>
       <enumerator name='HB_SCRIPT_INHERITED' value='1516858984'/>
@@ -2437,29 +2439,29 @@
       <enumerator name='_HB_SCRIPT_MAX_VALUE_SIGNED' value='2147483647'/>
     </enum-decl>
     <!-- enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* -->
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
     <!-- typedef enum hb_script_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, void*)* hb_unicode_script_func_t -->
-    <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-116' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-94'/>
+    <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-117' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-95'/>
     <!-- hb_codepoint_t* -->
-    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-104'/>
+    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-105'/>
     <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-118'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
     <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_compose_func_t -->
-    <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-118' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-95'/>
+    <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-119' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-96'/>
     <!-- typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
     <!-- typedef typedef hb_bool_t (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*)* hb_unicode_decompose_func_t -->
-    <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-120' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-96'/>
+    <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-121' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-97'/>
     <!-- unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* -->
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
     <!-- typedef unsigned int (hb_unicode_funcs_t*, typedef hb_codepoint_t, hb_codepoint_t*, void*)* hb_unicode_decompose_compatibility_func_t -->
-    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-122' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-97'/>
+    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-123' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-98'/>
     <!-- const hb_unicode_funcs_t -->
-    <qualified-type-def type-id='type-id-88' const='yes' id='type-id-123'/>
+    <qualified-type-def type-id='type-id-89' const='yes' id='type-id-124'/>
     <!-- const hb_unicode_funcs_t* -->
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-100'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-101'/>
     <!-- enum hb_buffer_flags_t -->
-    <enum-decl name='hb_buffer_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='174' column='1' id='type-id-67'>
+    <enum-decl name='hb_buffer_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='174' column='1' id='type-id-68'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_FLAG_DEFAULT' value='0'/>
       <enumerator name='HB_BUFFER_FLAG_BOT' value='1'/>
@@ -2467,25 +2469,25 @@
       <enumerator name='HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES' value='4'/>
     </enum-decl>
     <!-- enum hb_buffer_content_type_t -->
-    <enum-decl name='hb_buffer_content_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='119' column='1' id='type-id-69'>
+    <enum-decl name='hb_buffer_content_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='119' column='1' id='type-id-70'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_CONTENT_TYPE_INVALID' value='0'/>
       <enumerator name='HB_BUFFER_CONTENT_TYPE_UNICODE' value='1'/>
       <enumerator name='HB_BUFFER_CONTENT_TYPE_GLYPHS' value='2'/>
     </enum-decl>
     <!-- struct hb_segment_properties_t -->
-    <class-decl name='hb_segment_properties_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='65' column='1' id='type-id-124'>
+    <class-decl name='hb_segment_properties_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='65' column='1' id='type-id-125'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_direction_t hb_segment_properties_t::direction -->
-        <var-decl name='direction' type-id='type-id-125' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='66' column='1'/>
+        <var-decl name='direction' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- hb_script_t hb_segment_properties_t::script -->
-        <var-decl name='script' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='67' column='1'/>
+        <var-decl name='script' type-id='type-id-104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_language_t hb_segment_properties_t::language -->
-        <var-decl name='language' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='68' column='1'/>
+        <var-decl name='language' type-id='type-id-127' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- void* hb_segment_properties_t::reserved1 -->
@@ -2497,7 +2499,7 @@
       </data-member>
     </class-decl>
     <!-- enum hb_direction_t -->
-    <enum-decl name='hb_direction_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='111' column='1' id='type-id-125'>
+    <enum-decl name='hb_direction_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='111' column='1' id='type-id-126'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_DIRECTION_INVALID' value='0'/>
       <enumerator name='HB_DIRECTION_LTR' value='4'/>
@@ -2506,211 +2508,211 @@
       <enumerator name='HB_DIRECTION_BTT' value='7'/>
     </enum-decl>
     <!-- struct hb_language_impl_t -->
-    <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-127'>
+    <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-128'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <!-- char[1] const hb_language_impl_t::s -->
-        <var-decl name='s' type-id='type-id-128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
+        <!-- const char hb_language_impl_t::s[1] -->
+        <var-decl name='s' type-id='type-id-129' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
       </data-member>
     </class-decl>
     <!-- const hb_language_impl_t -->
-    <qualified-type-def type-id='type-id-127' const='yes' id='type-id-129'/>
+    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-130'/>
     <!-- const hb_language_impl_t* -->
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
     <!-- typedef const hb_language_impl_t* hb_language_t -->
-    <typedef-decl name='hb_language_t' type-id='type-id-130' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='137' column='1' id='type-id-126'/>
+    <typedef-decl name='hb_language_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='137' column='1' id='type-id-127'/>
     <!-- typedef hb_segment_properties_t hb_segment_properties_t -->
-    <typedef-decl name='hb_segment_properties_t' type-id='type-id-124' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-70'/>
+    <typedef-decl name='hb_segment_properties_t' type-id='type-id-125' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-71'/>
     <!-- struct hb_glyph_info_t -->
-    <class-decl name='hb_glyph_info_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='44' column='1' id='type-id-131'>
+    <class-decl name='hb_glyph_info_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='44' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_codepoint_t hb_glyph_info_t::codepoint -->
-        <var-decl name='codepoint' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='45' column='1'/>
+        <var-decl name='codepoint' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- hb_mask_t hb_glyph_info_t::mask -->
-        <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='46' column='1'/>
+        <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- uint32_t hb_glyph_info_t::cluster -->
-        <var-decl name='cluster' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='47' column='1'/>
+        <var-decl name='cluster' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- hb_var_int_t hb_glyph_info_t::var1 -->
-        <var-decl name='var1' type-id='type-id-132' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='50' column='1'/>
+        <var-decl name='var1' type-id='type-id-133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_var_int_t hb_glyph_info_t::var2 -->
-        <var-decl name='var2' type-id='type-id-132' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='51' column='1'/>
+        <var-decl name='var2' type-id='type-id-133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='51' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef uint32_t hb_mask_t -->
-    <typedef-decl name='hb_mask_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='77' column='1' id='type-id-86'/>
+    <typedef-decl name='hb_mask_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='77' column='1' id='type-id-87'/>
     <!-- union _hb_var_int_t -->
-    <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-133'>
+    <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-134'>
       <data-member access='private'>
         <!-- uint32_t _hb_var_int_t::u32 -->
-        <var-decl name='u32' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='80' column='1'/>
+        <var-decl name='u32' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='80' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- int32_t _hb_var_int_t::i32 -->
-        <var-decl name='i32' type-id='type-id-134' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='81' column='1'/>
+        <var-decl name='i32' type-id='type-id-135' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='81' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- uint16_t _hb_var_int_t::u16[2] -->
-        <var-decl name='u16' type-id='type-id-135' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='82' column='1'/>
+        <var-decl name='u16' type-id='type-id-136' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='82' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- int16_t _hb_var_int_t::i16[2] -->
-        <var-decl name='i16' type-id='type-id-136' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='83' column='1'/>
+        <var-decl name='i16' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='83' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- uint8_t _hb_var_int_t::u8[4] -->
-        <var-decl name='u8' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='84' column='1'/>
+        <var-decl name='u8' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='84' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- int8_t _hb_var_int_t::i8[4] -->
-        <var-decl name='i8' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='85' column='1'/>
+        <var-decl name='i8' type-id='type-id-139' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='85' column='1'/>
       </data-member>
     </union-decl>
     <!-- typedef int int32_t -->
-    <typedef-decl name='int32_t' type-id='type-id-4' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-134'/>
+    <typedef-decl name='int32_t' type-id='type-id-4' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-135'/>
     <!-- unsigned short int -->
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-139'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-140'/>
     <!-- typedef unsigned short int uint16_t -->
-    <typedef-decl name='uint16_t' type-id='type-id-139' filepath='/usr/include/stdint.h' line='50' column='1' id='type-id-140'/>
+    <typedef-decl name='uint16_t' type-id='type-id-140' filepath='/usr/include/stdint.h' line='50' column='1' id='type-id-141'/>
 
     <!-- uint16_t[2] -->
-    <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='32' id='type-id-135'>
+    <array-type-def dimensions='1' type-id='type-id-141' size-in-bits='32' id='type-id-136'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
     <!-- short int -->
-    <type-decl name='short int' size-in-bits='16' id='type-id-141'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-142'/>
     <!-- typedef short int int16_t -->
-    <typedef-decl name='int16_t' type-id='type-id-141' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-142'/>
+    <typedef-decl name='int16_t' type-id='type-id-142' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-143'/>
 
     <!-- int16_t[2] -->
-    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='32' id='type-id-136'>
+    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='32' id='type-id-137'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
     <!-- unsigned char -->
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-143'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-144'/>
     <!-- typedef unsigned char uint8_t -->
-    <typedef-decl name='uint8_t' type-id='type-id-143' filepath='/usr/include/stdint.h' line='49' column='1' id='type-id-144'/>
+    <typedef-decl name='uint8_t' type-id='type-id-144' filepath='/usr/include/stdint.h' line='49' column='1' id='type-id-145'/>
 
     <!-- uint8_t[4] -->
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='32' id='type-id-137'>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='32' id='type-id-138'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-42' id='type-id-145'/>
+      <subrange length='4' type-id='type-id-42' id='type-id-146'/>
 
     </array-type-def>
     <!-- signed char -->
-    <type-decl name='signed char' size-in-bits='8' id='type-id-146'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-147'/>
     <!-- typedef signed char int8_t -->
-    <typedef-decl name='int8_t' type-id='type-id-146' filepath='/usr/include/stdint.h' line='37' column='1' id='type-id-147'/>
+    <typedef-decl name='int8_t' type-id='type-id-147' filepath='/usr/include/stdint.h' line='37' column='1' id='type-id-148'/>
 
     <!-- int8_t[4] -->
-    <array-type-def dimensions='1' type-id='type-id-147' size-in-bits='32' id='type-id-138'>
+    <array-type-def dimensions='1' type-id='type-id-148' size-in-bits='32' id='type-id-139'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-42' id='type-id-145'/>
+      <subrange length='4' type-id='type-id-42' id='type-id-146'/>
 
     </array-type-def>
     <!-- typedef _hb_var_int_t hb_var_int_t -->
-    <typedef-decl name='hb_var_int_t' type-id='type-id-133' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-132'/>
+    <typedef-decl name='hb_var_int_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-133'/>
     <!-- typedef hb_glyph_info_t hb_glyph_info_t -->
-    <typedef-decl name='hb_glyph_info_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='52' column='1' id='type-id-81'/>
+    <typedef-decl name='hb_glyph_info_t' type-id='type-id-132' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='52' column='1' id='type-id-82'/>
     <!-- hb_glyph_info_t* -->
-    <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-71'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-72'/>
     <!-- struct hb_glyph_position_t -->
-    <class-decl name='hb_glyph_position_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='54' column='1' id='type-id-148'>
+    <class-decl name='hb_glyph_position_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='54' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_position_t hb_glyph_position_t::x_advance -->
-        <var-decl name='x_advance' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='55' column='1'/>
+        <var-decl name='x_advance' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- hb_position_t hb_glyph_position_t::y_advance -->
-        <var-decl name='y_advance' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='56' column='1'/>
+        <var-decl name='y_advance' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_position_t hb_glyph_position_t::x_offset -->
-        <var-decl name='x_offset' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='57' column='1'/>
+        <var-decl name='x_offset' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- hb_position_t hb_glyph_position_t::y_offset -->
-        <var-decl name='y_offset' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='58' column='1'/>
+        <var-decl name='y_offset' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_var_int_t hb_glyph_position_t::var -->
-        <var-decl name='var' type-id='type-id-132' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='61' column='1'/>
+        <var-decl name='var' type-id='type-id-133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='61' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef int32_t hb_position_t -->
-    <typedef-decl name='hb_position_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-149'/>
+    <typedef-decl name='hb_position_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-150'/>
     <!-- typedef hb_glyph_position_t hb_glyph_position_t -->
-    <typedef-decl name='hb_glyph_position_t' type-id='type-id-148' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='62' column='1' id='type-id-83'/>
+    <typedef-decl name='hb_glyph_position_t' type-id='type-id-149' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='62' column='1' id='type-id-84'/>
     <!-- hb_glyph_position_t* -->
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-72'/>
+    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-73'/>
 
     <!-- uint8_t[8] -->
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='64' id='type-id-73'>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='64' id='type-id-74'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
 
     <!-- const char*[8] -->
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='512' id='type-id-74'>
+    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='512' id='type-id-75'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <!-- const unsigned int -->
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-75'/>
+    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-76'/>
 
 
     <!-- hb_codepoint_t[2][5] -->
-    <array-type-def dimensions='2' type-id='type-id-68' size-in-bits='224' id='type-id-76'>
+    <array-type-def dimensions='2' type-id='type-id-69' size-in-bits='224' id='type-id-77'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
       <!-- <anonymous range>[5] -->
-      <subrange length='5' type-id='type-id-42' id='type-id-151'/>
+      <subrange length='5' type-id='type-id-42' id='type-id-152'/>
 
     </array-type-def>
 
     <!-- unsigned int[2] -->
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-77'>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-78'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
     <!-- const hb_buffer_t -->
-    <qualified-type-def type-id='type-id-64' const='yes' id='type-id-152'/>
+    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-153'/>
     <!-- const hb_buffer_t* -->
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-78'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-79'/>
     <!-- hb_glyph_info_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-81' size-in-bits='64' id='type-id-80'/>
+    <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-81'/>
     <!-- hb_buffer_t* -->
-    <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-79'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-80'/>
     <!-- hb_glyph_position_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-83' size-in-bits='64' id='type-id-82'/>
+    <reference-type-def kind='lvalue' type-id='type-id-84' size-in-bits='64' id='type-id-83'/>
     <!-- const hb_glyph_info_t -->
-    <qualified-type-def type-id='type-id-81' const='yes' id='type-id-153'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-154'/>
     <!-- const hb_glyph_info_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-153' size-in-bits='64' id='type-id-84'/>
+    <reference-type-def kind='lvalue' type-id='type-id-154' size-in-bits='64' id='type-id-85'/>
     <!-- const hb_codepoint_t -->
-    <qualified-type-def type-id='type-id-68' const='yes' id='type-id-154'/>
+    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-155'/>
     <!-- const hb_codepoint_t* -->
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-85'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-86'/>
     <!-- hb_buffer_t::scratch_buffer_t* -->
-    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-87'/>
+    <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-88'/>
     <!-- typedef hb_buffer_t hb_buffer_t -->
-    <typedef-decl name='hb_buffer_t' type-id='type-id-64' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-155'/>
+    <typedef-decl name='hb_buffer_t' type-id='type-id-65' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-156'/>
     <!-- struct hb_font_t -->
-    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-156'>
+    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-157'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_font_t::header -->
         <var-decl name='header' type-id='type-id-49' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='92' column='1'/>
@@ -2721,11 +2723,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_font_t* hb_font_t::parent -->
-        <var-decl name='parent' type-id='type-id-157' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
+        <var-decl name='parent' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- hb_face_t* hb_font_t::face -->
-        <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
+        <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- int hb_font_t::x_scale -->
@@ -2745,7 +2747,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
         <!-- hb_font_funcs_t* hb_font_t::klass -->
-        <var-decl name='klass' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
+        <var-decl name='klass' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- void* hb_font_t::user_data -->
@@ -2757,13 +2759,13 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- hb_shaper_data_t hb_font_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_font_t::_static_assertion_on_line_93() -->
         <function-decl name='_static_assertion_on_line_93' mangled-name='_ZNK9hb_font_t28_static_assertion_on_line_93Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'const hb_font_t*' -->
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -2772,77 +2774,77 @@
         <!-- hb_position_t hb_font_t::em_scale_x(int16_t) -->
         <function-decl name='em_scale_x' mangled-name='_ZN9hb_font_t10em_scale_xEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
-          <parameter type-id='type-id-142'/>
+          <parameter type-id='type-id-143'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::em_scale_y(int16_t) -->
         <function-decl name='em_scale_y' mangled-name='_ZN9hb_font_t10em_scale_yEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
-          <parameter type-id='type-id-142'/>
+          <parameter type-id='type-id-143'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::parent_scale_x_distance(hb_position_t) -->
         <function-decl name='parent_scale_x_distance' mangled-name='_ZN9hb_font_t23parent_scale_x_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
-          <parameter type-id='type-id-149'/>
+          <parameter type-id='type-id-150'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::parent_scale_y_distance(hb_position_t) -->
         <function-decl name='parent_scale_y_distance' mangled-name='_ZN9hb_font_t23parent_scale_y_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
-          <parameter type-id='type-id-149'/>
+          <parameter type-id='type-id-150'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::parent_scale_x_position(hb_position_t) -->
         <function-decl name='parent_scale_x_position' mangled-name='_ZN9hb_font_t23parent_scale_x_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
-          <parameter type-id='type-id-149'/>
+          <parameter type-id='type-id-150'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::parent_scale_y_position(hb_position_t) -->
         <function-decl name='parent_scale_y_position' mangled-name='_ZN9hb_font_t23parent_scale_y_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_position_t' -->
-          <parameter type-id='type-id-149'/>
+          <parameter type-id='type-id-150'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- void hb_font_t::parent_scale_distance(hb_position_t*, hb_position_t*) -->
         <function-decl name='parent_scale_distance' mangled-name='_ZN9hb_font_t21parent_scale_distanceEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -2851,11 +2853,11 @@
         <!-- void hb_font_t::parent_scale_position(hb_position_t*, hb_position_t*) -->
         <function-decl name='parent_scale_position' mangled-name='_ZN9hb_font_t21parent_scale_positionEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -2864,9 +2866,9 @@
         <!-- hb_bool_t hb_font_t::has_glyph(hb_codepoint_t) -->
         <function-decl name='has_glyph' mangled-name='_ZN9hb_font_t9has_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2875,13 +2877,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
         <function-decl name='get_glyph' mangled-name='_ZN9hb_font_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2890,35 +2892,35 @@
         <!-- hb_position_t hb_font_t::get_glyph_h_advance(hb_codepoint_t) -->
         <function-decl name='get_glyph_h_advance' mangled-name='_ZN9hb_font_t19get_glyph_h_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::get_glyph_v_advance(hb_codepoint_t) -->
         <function-decl name='get_glyph_v_advance' mangled-name='_ZN9hb_font_t19get_glyph_v_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_bool_t hb_font_t::get_glyph_h_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_h_origin' mangled-name='_ZN9hb_font_t18get_glyph_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2927,13 +2929,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_v_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_v_origin' mangled-name='_ZN9hb_font_t18get_glyph_v_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2942,37 +2944,37 @@
         <!-- hb_position_t hb_font_t::get_glyph_h_kerning(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='get_glyph_h_kerning' mangled-name='_ZN9hb_font_t19get_glyph_h_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_position_t hb_font_t::get_glyph_v_kerning(hb_codepoint_t, hb_codepoint_t) -->
         <function-decl name='get_glyph_v_kerning' mangled-name='_ZN9hb_font_t19get_glyph_v_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <!-- hb_bool_t hb_font_t::get_glyph_extents(hb_codepoint_t, hb_glyph_extents_t*) -->
         <function-decl name='get_glyph_extents' mangled-name='_ZN9hb_font_t17get_glyph_extentsEjP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_glyph_extents_t*' -->
-          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-164'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2981,15 +2983,15 @@
         <!-- hb_bool_t hb_font_t::get_glyph_contour_point(hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_contour_point' mangled-name='_ZN9hb_font_t23get_glyph_contour_pointEjjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -2998,9 +3000,9 @@
         <!-- hb_bool_t hb_font_t::get_glyph_name(hb_codepoint_t, char*, unsigned int) -->
         <function-decl name='get_glyph_name' mangled-name='_ZN9hb_font_t14get_glyph_nameEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-61'/>
           <!-- parameter of type 'unsigned int' -->
@@ -3013,13 +3015,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_from_name(const char*, int, hb_codepoint_t*) -->
         <function-decl name='get_glyph_from_name' mangled-name='_ZN9hb_font_t19get_glyph_from_nameEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-50'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-4'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -3028,15 +3030,15 @@
         <!-- void hb_font_t::get_glyph_advance_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_advance_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_advance_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -3045,13 +3047,13 @@
         <!-- void hb_font_t::guess_v_origin_minus_h_origin(hb_codepoint_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='guess_v_origin_minus_h_origin' mangled-name='_ZN9hb_font_t29guess_v_origin_minus_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -3060,15 +3062,15 @@
         <!-- void hb_font_t::get_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30get_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -3077,15 +3079,15 @@
         <!-- void hb_font_t::add_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='add_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30add_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -3094,15 +3096,15 @@
         <!-- void hb_font_t::subtract_glyph_origin_for_direction(hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='subtract_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t35subtract_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -3111,17 +3113,17 @@
         <!-- void hb_font_t::get_glyph_kerning_for_direction(hb_codepoint_t, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_kerning_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_kerning_for_directionEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -3130,13 +3132,13 @@
         <!-- hb_bool_t hb_font_t::get_glyph_extents_for_origin(hb_codepoint_t, hb_direction_t, hb_glyph_extents_t*) -->
         <function-decl name='get_glyph_extents_for_origin' mangled-name='_ZN9hb_font_t28get_glyph_extents_for_originEj14hb_direction_tP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_glyph_extents_t*' -->
-          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-164'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -3145,17 +3147,17 @@
         <!-- hb_bool_t hb_font_t::get_glyph_contour_point_for_origin(hb_codepoint_t, unsigned int, hb_direction_t, hb_position_t*, hb_position_t*) -->
         <function-decl name='get_glyph_contour_point_for_origin' mangled-name='_ZN9hb_font_t34get_glyph_contour_point_for_originEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'enum hb_direction_t' -->
-          <parameter type-id='type-id-125'/>
+          <parameter type-id='type-id-126'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- parameter of type 'hb_position_t*' -->
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -3164,9 +3166,9 @@
         <!-- void hb_font_t::glyph_to_string(hb_codepoint_t, char*, unsigned int) -->
         <function-decl name='glyph_to_string' mangled-name='_ZN9hb_font_t15glyph_to_stringEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'char*' -->
           <parameter type-id='type-id-61'/>
           <!-- parameter of type 'unsigned int' -->
@@ -3179,13 +3181,13 @@
         <!-- hb_bool_t hb_font_t::glyph_from_string(const char*, int, hb_codepoint_t*) -->
         <function-decl name='glyph_from_string' mangled-name='_ZN9hb_font_t17glyph_from_stringEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'const char*' -->
           <parameter type-id='type-id-50'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-4'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- typedef hb_bool_t -->
           <return type-id='type-id-26'/>
         </function-decl>
@@ -3194,39 +3196,39 @@
         <!-- hb_position_t hb_font_t::em_scale(int16_t, int) -->
         <function-decl name='em_scale' mangled-name='_ZN9hb_font_t8em_scaleEsi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
           <!-- implicit parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <!-- parameter of type 'typedef int16_t' -->
-          <parameter type-id='type-id-142'/>
+          <parameter type-id='type-id-143'/>
           <!-- parameter of type 'int' -->
           <parameter type-id='type-id-4'/>
           <!-- typedef hb_position_t -->
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
     </class-decl>
     <!-- typedef hb_font_t hb_font_t -->
-    <typedef-decl name='hb_font_t' type-id='type-id-156' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-164'/>
+    <typedef-decl name='hb_font_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-165'/>
     <!-- hb_font_t* -->
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-157'/>
+    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-158'/>
     <!-- hb_bool_t hb_buffer_deserialize_glyphs(hb_buffer_t*, const char*, int, const char**, hb_font_t*, hb_buffer_serialize_format_t) -->
     <function-decl name='hb_buffer_deserialize_glyphs' mangled-name='hb_buffer_deserialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_deserialize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-50' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='354' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='buf_len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='355' column='1'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-62' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
+      <parameter type-id='type-id-63' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
-      <parameter type-id='type-id-63' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
+      <parameter type-id='type-id-64' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- enum hb_buffer_serialize_flags_t -->
-    <enum-decl name='hb_buffer_serialize_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='298' column='1' id='type-id-165'>
+    <enum-decl name='hb_buffer_serialize_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='298' column='1' id='type-id-166'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FLAG_DEFAULT' value='0'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS' value='1'/>
@@ -3236,7 +3238,7 @@
     <!-- unsigned int hb_buffer_serialize_glyphs(hb_buffer_t*, unsigned int, unsigned int, char*, unsigned int, unsigned int*, hb_font_t*, hb_buffer_serialize_format_t, hb_buffer_serialize_flags_t) -->
     <function-decl name='hb_buffer_serialize_glyphs' mangled-name='hb_buffer_serialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='start' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='247' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3248,11 +3250,11 @@
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='buf_consumed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='251' column='1'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_format_t' -->
-      <parameter type-id='type-id-63' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
+      <parameter type-id='type-id-64' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
       <!-- parameter of type 'enum hb_buffer_serialize_flags_t' -->
-      <parameter type-id='type-id-165' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='254' column='1'/>
+      <parameter type-id='type-id-166' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='254' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
@@ -3263,120 +3265,124 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='63' column='1'/>
       <!-- enum hb_buffer_serialize_format_t -->
-      <return type-id='type-id-63'/>
+      <return type-id='type-id-64'/>
     </function-decl>
-    <!-- char[1] const -->
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-128'/>
+    <!-- const char[1] -->
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='8' id='type-id-129'>
+      <!-- <anonymous range>[1] -->
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
+
+    </array-type-def>
     <!-- const hb_font_t* -->
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-161'/>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-162'/>
     <!-- hb_script_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-115'>
+    <function-type size-in-bits='64' id='type-id-116'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-type>
     <!-- hb_unicode_combining_class_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-107'>
+    <function-type size-in-bits='64' id='type-id-108'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- enum hb_unicode_combining_class_t -->
-      <return type-id='type-id-101'/>
+      <return type-id='type-id-102'/>
     </function-type>
     <!-- hb_unicode_general_category_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-111'>
+    <function-type size-in-bits='64' id='type-id-112'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- enum hb_unicode_general_category_t -->
-      <return type-id='type-id-102'/>
+      <return type-id='type-id-103'/>
     </function-type>
     <!-- hb_bool_t (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-119'>
+    <function-type size-in-bits='64' id='type-id-120'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-type>
     <!-- hb_bool_t (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-117'>
+    <function-type size-in-bits='64' id='type-id-118'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-type>
     <!-- hb_codepoint_t (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-113'>
+    <function-type size-in-bits='64' id='type-id-114'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_codepoint_t -->
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-type>
     <!-- unsigned int (hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, void*) -->
-    <function-type size-in-bits='64' id='type-id-121'>
+    <function-type size-in-bits='64' id='type-id-122'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-type>
     <!-- unsigned int (hb_unicode_funcs_t*, hb_codepoint_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-109'>
+    <function-type size-in-bits='64' id='type-id-110'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66'/>
+      <parameter type-id='type-id-67'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-type>
     <!-- hb_face_t* -->
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-158'/>
-    <!-- hb_font_funcs_t* -->
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-159'/>
+    <!-- hb_font_funcs_t* -->
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-160'/>
     <!-- hb_glyph_extents_t* -->
-    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-164'/>
     <!-- hb_position_t* -->
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-162'/>
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-163'/>
     <!-- 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-160'>
+    <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-161'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- void* hb_shaper_data_t::ot -->
         <var-decl name='ot' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-list.hh' line='43' column='1'/>
@@ -3386,20 +3392,14 @@
         <var-decl name='fallback' type-id='type-id-20' 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>
-    <!-- char[1] -->
-    <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='8' id='type-id-166'>
-      <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
-
-    </array-type-def>
     <!-- const hb_font_t -->
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-167'/>
+    <qualified-type-def type-id='type-id-157' const='yes' id='type-id-168'/>
     <!-- typedef hb_face_t hb_face_t -->
-    <typedef-decl name='hb_face_t' type-id='type-id-172' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-168'/>
+    <typedef-decl name='hb_face_t' type-id='type-id-172' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-169'/>
     <!-- typedef hb_font_funcs_t hb_font_funcs_t -->
-    <typedef-decl name='hb_font_funcs_t' type-id='type-id-173' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-169'/>
+    <typedef-decl name='hb_font_funcs_t' type-id='type-id-173' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-170'/>
     <!-- typedef hb_glyph_extents_t hb_glyph_extents_t -->
-    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-174' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-170'/>
+    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-174' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-171'/>
     <!-- struct hb_face_t -->
     <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-172'>
       <member-type access='public'>
@@ -3449,7 +3449,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- hb_shaper_data_t hb_face_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <!-- hb_face_t::plan_node_t* hb_face_t::shape_plans -->
@@ -3695,19 +3695,19 @@
     <class-decl name='hb_glyph_extents_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='84' column='1' id='type-id-174'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_position_t hb_glyph_extents_t::x_bearing -->
-        <var-decl name='x_bearing' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='85' column='1'/>
+        <var-decl name='x_bearing' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- hb_position_t hb_glyph_extents_t::y_bearing -->
-        <var-decl name='y_bearing' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='86' column='1'/>
+        <var-decl name='y_bearing' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_position_t hb_glyph_extents_t::width -->
-        <var-decl name='width' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='87' column='1'/>
+        <var-decl name='width' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- hb_position_t hb_glyph_extents_t::height -->
-        <var-decl name='height' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='88' column='1'/>
+        <var-decl name='height' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='88' column='1'/>
       </data-member>
     </class-decl>
     <!-- const hb_face_t* -->
@@ -3743,7 +3743,7 @@
     <!-- typedef hb_blob_t* (hb_face_t*, typedef hb_tag_t, void*)* hb_reference_table_func_t -->
     <typedef-decl name='hb_reference_table_func_t' type-id='type-id-207' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-178'/>
     <!-- typedef uint32_t hb_tag_t -->
-    <typedef-decl name='hb_tag_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-180'/>
+    <typedef-decl name='hb_tag_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-180'/>
     <!-- const hb_face_t -->
     <qualified-type-def type-id='type-id-172' const='yes' id='type-id-196'/>
     <!-- const hb_font_funcs_t -->
@@ -3771,7 +3771,7 @@
     <!-- hb_blob_t* (hb_face_t*, hb_tag_t, void*) -->
     <function-type size-in-bits='64' id='type-id-208'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-159'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180'/>
       <!-- parameter of type 'void*' -->
@@ -3782,7 +3782,7 @@
     <!-- hb_bool_t (hb_font_t*, void*, const char*, int, hb_codepoint_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-209'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'const char*' -->
@@ -3790,7 +3790,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
@@ -3799,11 +3799,11 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, char*, unsigned int, void*) -->
     <function-type size-in-bits='64' id='type-id-210'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-61'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3816,13 +3816,13 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_glyph_extents_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-211'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
-      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-164'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
@@ -3831,15 +3831,15 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-212'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
@@ -3848,17 +3848,17 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-213'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
@@ -3876,11 +3876,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- hb_face_t* hb_shape_plan_t::face_unsafe -->
-        <var-decl name='face_unsafe' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
+        <var-decl name='face_unsafe' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- hb_segment_properties_t hb_shape_plan_t::props -->
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='42' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <!-- hb_shape_func_t* hb_shape_plan_t::shaper_func -->
@@ -3900,7 +3900,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- hb_shaper_data_t hb_shape_plan_t::shaper_data -->
-        <var-decl name='shaper_data' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- void hb_shape_plan_t::_static_assertion_on_line_38() -->
@@ -3923,15 +3923,15 @@
     <!-- hb_bool_t (hb_font_t*, void*, hb_codepoint_t, hb_position_t*, hb_position_t*, void*) -->
     <function-type size-in-bits='64' id='type-id-221'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-163'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_bool_t -->
@@ -3940,30 +3940,30 @@
     <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-222'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_position_t -->
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-type>
     <!-- hb_position_t (hb_font_t*, void*, hb_codepoint_t, void*) -->
     <function-type size-in-bits='64' id='type-id-223'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20'/>
       <!-- typedef hb_position_t -->
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-type>
     <!-- hb_feature_t* -->
     <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-219'/>
@@ -3980,9 +3980,9 @@
       <!-- parameter of type 'hb_shape_plan_t*' -->
       <parameter type-id='type-id-176'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-80'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-229'/>
       <!-- parameter of type 'unsigned int' -->
@@ -3998,7 +3998,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- uint32_t hb_feature_t::value -->
-        <var-decl name='value' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='45' column='1'/>
+        <var-decl name='value' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int hb_feature_t::start -->
@@ -4025,7 +4025,7 @@
           <!-- parameter of type 'const uint32_t*' -->
           <parameter type-id='type-id-232'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- const uint32_t* -->
@@ -4040,7 +4040,7 @@
           <!-- parameter of type 'const uint32_t*' -->
           <parameter type-id='type-id-232'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- const uint32_t* -->
@@ -4058,7 +4058,7 @@
       </member-function>
     </class-decl>
     <!-- const uint32_t -->
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-233'/>
+    <qualified-type-def type-id='type-id-107' const='yes' id='type-id-233'/>
     <!-- const uint32_t* -->
     <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-232'/>
     <!-- struct hb_utf_t<short unsigned int, true> -->
@@ -4071,9 +4071,9 @@
           <!-- parameter of type 'const uint16_t*' -->
           <parameter type-id='type-id-235'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- const uint16_t* -->
           <return type-id='type-id-235'/>
         </function-decl>
@@ -4086,9 +4086,9 @@
           <!-- parameter of type 'const uint16_t*' -->
           <parameter type-id='type-id-235'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- const uint16_t* -->
           <return type-id='type-id-235'/>
         </function-decl>
@@ -4104,7 +4104,7 @@
       </member-function>
     </class-decl>
     <!-- const uint16_t -->
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-236'/>
+    <qualified-type-def type-id='type-id-141' const='yes' id='type-id-236'/>
     <!-- const uint16_t* -->
     <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-235'/>
     <!-- struct hb_utf_t<unsigned char, true> -->
@@ -4117,9 +4117,9 @@
           <!-- parameter of type 'const uint8_t*' -->
           <parameter type-id='type-id-238'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- const uint8_t* -->
           <return type-id='type-id-238'/>
         </function-decl>
@@ -4132,9 +4132,9 @@
           <!-- parameter of type 'const uint8_t*' -->
           <parameter type-id='type-id-238'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- const uint8_t* -->
           <return type-id='type-id-238'/>
         </function-decl>
@@ -4150,11 +4150,11 @@
       </member-function>
     </class-decl>
     <!-- const uint8_t -->
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-239'/>
+    <qualified-type-def type-id='type-id-145' const='yes' id='type-id-239'/>
     <!-- const uint8_t* -->
     <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-238'/>
     <!-- const hb_segment_properties_t -->
-    <qualified-type-def type-id='type-id-70' const='yes' id='type-id-240'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-240'/>
     <!-- const hb_segment_properties_t* -->
     <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-241'/>
     <!-- hb_bool_t hb_segment_properties_equal(const hb_segment_properties_t*, const hb_segment_properties_t*) -->
@@ -4176,58 +4176,58 @@
     <!-- hb_buffer_t* hb_buffer_get_empty() -->
     <function-decl name='hb_buffer_get_empty' mangled-name='hb_buffer_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_empty'>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-79'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <!-- void hb_buffer_set_content_type(hb_buffer_t*, hb_buffer_content_type_t) -->
     <function-decl name='hb_buffer_set_content_type' mangled-name='hb_buffer_set_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_content_type'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
       <!-- parameter of type 'enum hb_buffer_content_type_t' -->
-      <parameter type-id='type-id-69' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
+      <parameter type-id='type-id-70' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_buffer_content_type_t hb_buffer_get_content_type(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_content_type' mangled-name='hb_buffer_get_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_content_type'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
       <!-- enum hb_buffer_content_type_t -->
-      <return type-id='type-id-69'/>
+      <return type-id='type-id-70'/>
     </function-decl>
     <!-- hb_unicode_funcs_t* hb_buffer_get_unicode_funcs(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_unicode_funcs' mangled-name='hb_buffer_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_unicode_funcs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <!-- hb_direction_t hb_buffer_get_direction(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_direction' mangled-name='hb_buffer_get_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_direction'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
       <!-- enum hb_direction_t -->
-      <return type-id='type-id-125'/>
+      <return type-id='type-id-126'/>
     </function-decl>
     <!-- hb_script_t hb_buffer_get_script(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_script' mangled-name='hb_buffer_get_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_script'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <!-- hb_language_t hb_buffer_get_language(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_language' mangled-name='hb_buffer_get_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_language'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
       <!-- typedef hb_language_t -->
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
     <!-- hb_segment_properties_t* -->
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-242'/>
     <!-- void hb_buffer_get_segment_properties(hb_buffer_t*, hb_segment_properties_t*) -->
     <function-decl name='hb_buffer_get_segment_properties' mangled-name='hb_buffer_get_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
       <!-- parameter of type 'hb_segment_properties_t*' -->
       <parameter type-id='type-id-242' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <!-- void -->
@@ -4236,62 +4236,62 @@
     <!-- hb_buffer_flags_t hb_buffer_get_flags(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_flags' mangled-name='hb_buffer_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_flags'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
       <!-- enum hb_buffer_flags_t -->
-      <return type-id='type-id-67'/>
+      <return type-id='type-id-68'/>
     </function-decl>
     <!-- hb_codepoint_t hb_buffer_get_replacement_codepoint(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_replacement_codepoint' mangled-name='hb_buffer_get_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_replacement_codepoint'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
       <!-- typedef hb_codepoint_t -->
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <!-- hb_bool_t hb_buffer_allocation_successful(hb_buffer_t*) -->
     <function-decl name='hb_buffer_allocation_successful' mangled-name='hb_buffer_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_allocation_successful'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- unsigned int hb_buffer_get_length(hb_buffer_t*) -->
     <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
     <!-- hb_glyph_info_t* hb_buffer_get_glyph_infos(hb_buffer_t*, unsigned int*) -->
     <function-decl name='hb_buffer_get_glyph_infos' mangled-name='hb_buffer_get_glyph_infos' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_infos'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1238' column='1'/>
       <!-- hb_glyph_info_t* -->
-      <return type-id='type-id-71'/>
+      <return type-id='type-id-72'/>
     </function-decl>
     <!-- void hb_buffer_set_replacement_codepoint(hb_buffer_t*, hb_codepoint_t) -->
     <function-decl name='hb_buffer_set_replacement_codepoint' mangled-name='hb_buffer_set_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_replacement_codepoint'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
+      <parameter type-id='type-id-69' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_set_flags(hb_buffer_t*, hb_buffer_flags_t) -->
     <function-decl name='hb_buffer_set_flags' mangled-name='hb_buffer_set_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_flags'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
       <!-- parameter of type 'enum hb_buffer_flags_t' -->
-      <parameter type-id='type-id-67' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
+      <parameter type-id='type-id-68' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_set_segment_properties(hb_buffer_t*, const hb_segment_properties_t*) -->
     <function-decl name='hb_buffer_set_segment_properties' mangled-name='hb_buffer_set_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
       <parameter type-id='type-id-241' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <!-- void -->
@@ -4300,80 +4300,80 @@
     <!-- void hb_buffer_set_language(hb_buffer_t*, hb_language_t) -->
     <function-decl name='hb_buffer_set_language' mangled-name='hb_buffer_set_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_language'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
       <!-- parameter of type 'typedef hb_language_t' -->
-      <parameter type-id='type-id-126' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
+      <parameter type-id='type-id-127' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_set_script(hb_buffer_t*, hb_script_t) -->
     <function-decl name='hb_buffer_set_script' mangled-name='hb_buffer_set_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_script'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
       <!-- parameter of type 'enum hb_script_t' -->
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_set_direction(hb_buffer_t*, hb_direction_t) -->
     <function-decl name='hb_buffer_set_direction' mangled-name='hb_buffer_set_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_direction'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_reverse(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reverse' mangled-name='hb_buffer_reverse' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_reverse_clusters(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reverse_clusters' mangled-name='hb_buffer_reverse_clusters' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse_clusters'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_glyph_position_t* hb_buffer_get_glyph_positions(hb_buffer_t*, unsigned int*) -->
     <function-decl name='hb_buffer_get_glyph_positions' mangled-name='hb_buffer_get_glyph_positions' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_positions'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1260' column='1'/>
       <!-- hb_glyph_position_t* -->
-      <return type-id='type-id-72'/>
+      <return type-id='type-id-73'/>
     </function-decl>
     <!-- void hb_buffer_clear_contents(hb_buffer_t*) -->
     <function-decl name='hb_buffer_clear_contents' mangled-name='hb_buffer_clear_contents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_clear_contents'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_set_unicode_funcs(hb_buffer_t*, hb_unicode_funcs_t*) -->
     <function-decl name='hb_buffer_set_unicode_funcs' mangled-name='hb_buffer_set_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_unicode_funcs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
+      <parameter type-id='type-id-67' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_buffer_reset(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reset' mangled-name='hb_buffer_reset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reset'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void* hb_buffer_get_user_data(hb_buffer_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_buffer_get_user_data' mangled-name='hb_buffer_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_user_data'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='794' column='1'/>
       <!-- void* -->
@@ -4382,7 +4382,7 @@
     <!-- hb_bool_t hb_buffer_set_user_data(hb_buffer_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_buffer_set_user_data' mangled-name='hb_buffer_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_user_data'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='773' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -4397,33 +4397,33 @@
     <!-- hb_buffer_t* hb_buffer_reference(hb_buffer_t*) -->
     <function-decl name='hb_buffer_reference' mangled-name='hb_buffer_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reference'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-79'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <!-- void hb_buffer_destroy(hb_buffer_t*) -->
     <function-decl name='hb_buffer_destroy' mangled-name='hb_buffer_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_destroy'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_buffer_t* hb_buffer_create() -->
     <function-decl name='hb_buffer_create' mangled-name='hb_buffer_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_create'>
       <!-- hb_buffer_t* -->
-      <return type-id='type-id-79'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <!-- void hb_buffer_guess_segment_properties(hb_buffer_t*) -->
     <function-decl name='hb_buffer_guess_segment_properties' mangled-name='hb_buffer_guess_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_guess_segment_properties'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_bool_t hb_buffer_pre_allocate(hb_buffer_t*, unsigned int) -->
     <function-decl name='hb_buffer_pre_allocate' mangled-name='hb_buffer_pre_allocate' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_pre_allocate'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -4432,9 +4432,9 @@
     <!-- void hb_buffer_add(hb_buffer_t*, hb_codepoint_t, unsigned int) -->
     <function-decl name='hb_buffer_add' mangled-name='hb_buffer_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
+      <parameter type-id='type-id-69' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='cluster' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1162' column='1'/>
       <!-- void -->
@@ -4443,9 +4443,9 @@
     <!-- void hb_buffer_add_codepoints(hb_buffer_t*, const hb_codepoint_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_codepoints' mangled-name='hb_buffer_add_codepoints' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_codepoints'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
       <!-- parameter of type 'const hb_codepoint_t*' -->
-      <parameter type-id='type-id-85' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
+      <parameter type-id='type-id-86' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1481' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -4458,7 +4458,7 @@
     <!-- void hb_buffer_add_utf32(hb_buffer_t*, const uint32_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf32' mangled-name='hb_buffer_add_utf32' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf32'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
       <!-- parameter of type 'const uint32_t*' -->
       <parameter type-id='type-id-232' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <!-- parameter of type 'int' -->
@@ -4473,7 +4473,7 @@
     <!-- void hb_buffer_add_utf16(hb_buffer_t*, const uint16_t*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf16' mangled-name='hb_buffer_add_utf16' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf16'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
       <!-- parameter of type 'const uint16_t*' -->
       <parameter type-id='type-id-235' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <!-- parameter of type 'int' -->
@@ -4488,7 +4488,7 @@
     <!-- hb_bool_t hb_buffer_set_length(hb_buffer_t*, unsigned int) -->
     <function-decl name='hb_buffer_set_length' mangled-name='hb_buffer_set_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_length'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <!-- typedef hb_bool_t -->
@@ -4497,7 +4497,7 @@
     <!-- void hb_buffer_add_utf8(hb_buffer_t*, const char*, int, unsigned int, int) -->
     <function-decl name='hb_buffer_add_utf8' mangled-name='hb_buffer_add_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf8'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-50' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1414' column='1'/>
       <!-- parameter of type 'int' -->
@@ -4512,7 +4512,7 @@
     <!-- void hb_buffer_normalize_glyphs(hb_buffer_t*) -->
     <function-decl name='hb_buffer_normalize_glyphs' mangled-name='hb_buffer_normalize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_normalize_glyphs'>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -4526,7 +4526,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_language_t hb_language_item_t::lang -->
-        <var-decl name='lang' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='215' column='1'/>
+        <var-decl name='lang' type-id='type-id-127' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='215' column='1'/>
       </data-member>
       <member-function access='public'>
         <!-- bool hb_language_item_t::operator==(const char*) -->
@@ -4590,23 +4590,23 @@
     <!-- const char* hb_language_to_string(hb_language_t) -->
     <function-decl name='hb_language_to_string' mangled-name='hb_language_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_language_to_string'>
       <!-- parameter of type 'typedef hb_language_t' -->
-      <parameter type-id='type-id-126' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='325' column='1'/>
+      <parameter type-id='type-id-127' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='325' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-50'/>
     </function-decl>
     <!-- hb_tag_t hb_script_to_iso15924_tag(hb_script_t) -->
     <function-decl name='hb_script_to_iso15924_tag' mangled-name='hb_script_to_iso15924_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_to_iso15924_tag'>
       <!-- parameter of type 'enum hb_script_t' -->
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1'/>
       <!-- typedef hb_tag_t -->
       <return type-id='type-id-180'/>
     </function-decl>
     <!-- hb_direction_t hb_script_get_horizontal_direction(hb_script_t) -->
     <function-decl name='hb_script_get_horizontal_direction' mangled-name='hb_script_get_horizontal_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_get_horizontal_direction'>
       <!-- parameter of type 'enum hb_script_t' -->
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1'/>
       <!-- enum hb_direction_t -->
-      <return type-id='type-id-125'/>
+      <return type-id='type-id-126'/>
     </function-decl>
     <!-- void hb_version(unsigned int*, unsigned int*, unsigned int*) -->
     <function-decl name='hb_version' mangled-name='hb_version' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_version'>
@@ -4640,7 +4640,7 @@
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <!-- hb_script_t hb_script_from_string(const char*, int) -->
     <function-decl name='hb_script_from_string' mangled-name='hb_script_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_from_string'>
@@ -4649,12 +4649,12 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='413' column='1'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <!-- const char* hb_direction_to_string(hb_direction_t) -->
     <function-decl name='hb_direction_to_string' mangled-name='hb_direction_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_direction_to_string'>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='155' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='155' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-50'/>
     </function-decl>
@@ -4665,7 +4665,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='128' column='1'/>
       <!-- enum hb_direction_t -->
-      <return type-id='type-id-125'/>
+      <return type-id='type-id-126'/>
     </function-decl>
     <!-- hb_language_t hb_language_from_string(const char*, int) -->
     <function-decl name='hb_language_from_string' mangled-name='hb_language_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_language_from_string'>
@@ -4674,12 +4674,12 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='293' column='1'/>
       <!-- typedef hb_language_t -->
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
     <!-- hb_language_t hb_language_get_default() -->
     <function-decl name='hb_language_get_default' mangled-name='hb_language_get_default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_language_get_default'>
       <!-- typedef hb_language_t -->
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
@@ -4689,7 +4689,7 @@
       <class-decl name='BEInt&lt;unsigned int, 4&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='532' column='1' id='type-id-248'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<unsigned int, 4>::v[4] -->
-          <var-decl name='v' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
+          <var-decl name='v' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::BEInt<unsigned int, 4>::set(unsigned int) -->
@@ -4746,7 +4746,7 @@
             <!-- implicit parameter of type 'OT::BEInt<short unsigned int, 2>*' -->
             <parameter type-id='type-id-254' is-artificial='yes'/>
             <!-- parameter of type 'unsigned short int' -->
-            <parameter type-id='type-id-139'/>
+            <parameter type-id='type-id-140'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4757,7 +4757,7 @@
             <!-- implicit parameter of type 'const OT::BEInt<short unsigned int, 2>*' -->
             <parameter type-id='type-id-255' is-artificial='yes'/>
             <!-- unsigned short int -->
-            <return type-id='type-id-139'/>
+            <return type-id='type-id-140'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -4791,11 +4791,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<short unsigned int, 2u>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<short unsigned int, 2u>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::IntType<short unsigned int, 2u>::set(unsigned short int) -->
@@ -4803,7 +4803,7 @@
             <!-- implicit parameter of type 'OT::IntType<short unsigned int, 2u>*' -->
             <parameter type-id='type-id-258' is-artificial='yes'/>
             <!-- parameter of type 'unsigned short int' -->
-            <parameter type-id='type-id-139'/>
+            <parameter type-id='type-id-140'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4814,7 +4814,7 @@
             <!-- implicit parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
             <parameter type-id='type-id-259' is-artificial='yes'/>
             <!-- unsigned short int -->
-            <return type-id='type-id-139'/>
+            <return type-id='type-id-140'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -4867,7 +4867,7 @@
             <!-- implicit parameter of type 'const OT::IntType<short unsigned int, 2u>*' -->
             <parameter type-id='type-id-259' is-artificial='yes'/>
             <!-- parameter of type 'unsigned short int' -->
-            <parameter type-id='type-id-139'/>
+            <parameter type-id='type-id-140'/>
             <!-- int -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -4901,7 +4901,7 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_sanitize_context_t::max_debug_depth -->
-          <var-decl name='max_debug_depth' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='180' column='1'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='180' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned int OT::hb_sanitize_context_t::debug_depth -->
@@ -6952,11 +6952,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::OffsetTable& OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
@@ -7022,11 +7022,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-438'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Offset<OT::IntType<unsigned int, 4u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Offset<OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::Offset<OT::IntType<unsigned int, 4u> >::is_null() -->
@@ -7055,11 +7055,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 4u>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 4u>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::IntType<unsigned int, 4u>::set(unsigned int) -->
@@ -7185,7 +7185,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTable::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='118' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='118' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::OffsetTable::get_table_count() -->
@@ -7267,11 +7267,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-438'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Tag::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Tag::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const char* OT::Tag::operator const char*() -->
@@ -7323,11 +7323,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::TableRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::TableRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::TableRecord::sanitize(OT::hb_sanitize_context_t*) -->
@@ -7356,11 +7356,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-438'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CheckSum::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CheckSum::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <!-- uint32_t OT::CheckSum::CalcTableChecksum(uint32_t) -->
@@ -7368,9 +7368,9 @@
             <!-- parameter of type 'const OT::ULONG*' -->
             <parameter type-id='type-id-455'/>
             <!-- parameter of type 'typedef uint32_t' -->
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <!-- typedef uint32_t -->
-            <return type-id='type-id-106'/>
+            <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7962,11 +7962,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::maxp::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::maxp::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::maxp::get_num_glyphs() -->
@@ -8010,11 +8010,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FixedVersion::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FixedVersion::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- uint32_t OT::FixedVersion::to_int() -->
@@ -8022,7 +8022,7 @@
             <!-- implicit parameter of type 'const OT::FixedVersion*' -->
             <parameter type-id='type-id-271' is-artificial='yes'/>
             <!-- typedef uint32_t -->
-            <return type-id='type-id-106'/>
+            <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8122,11 +8122,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::head::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::head::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::head::get_upem() -->
@@ -8170,11 +8170,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LONGDATETIME::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LONGDATETIME::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::LONGDATETIME::sanitize(OT::hb_sanitize_context_t*) -->
@@ -8205,11 +8205,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<int, 4u>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<int, 4u>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::IntType<int, 4u>::set(int) -->
@@ -8311,7 +8311,7 @@
       <class-decl name='BEInt&lt;int, 4&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='532' column='1' id='type-id-507'>
         <data-member access='private' layout-offset-in-bits='0'>
           <!-- uint8_t OT::BEInt<int, 4>::v[4] -->
-          <var-decl name='v' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
+          <var-decl name='v' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::BEInt<int, 4>::set(int) -->
@@ -8366,11 +8366,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<short int, 2u>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<short int, 2u>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::IntType<short int, 2u>::set(short int) -->
@@ -8378,7 +8378,7 @@
             <!-- implicit parameter of type 'OT::IntType<short int, 2u>*' -->
             <parameter type-id='type-id-516' is-artificial='yes'/>
             <!-- parameter of type 'short int' -->
-            <parameter type-id='type-id-141'/>
+            <parameter type-id='type-id-142'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -8389,7 +8389,7 @@
             <!-- implicit parameter of type 'const OT::IntType<short int, 2u>*' -->
             <parameter type-id='type-id-383' is-artificial='yes'/>
             <!-- short int -->
-            <return type-id='type-id-141'/>
+            <return type-id='type-id-142'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8442,7 +8442,7 @@
             <!-- implicit parameter of type 'const OT::IntType<short int, 2u>*' -->
             <parameter type-id='type-id-383' is-artificial='yes'/>
             <!-- parameter of type 'short int' -->
-            <parameter type-id='type-id-141'/>
+            <parameter type-id='type-id-142'/>
             <!-- int -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -8480,7 +8480,7 @@
             <!-- implicit parameter of type 'OT::BEInt<short int, 2>*' -->
             <parameter type-id='type-id-518' is-artificial='yes'/>
             <!-- parameter of type 'short int' -->
-            <parameter type-id='type-id-141'/>
+            <parameter type-id='type-id-142'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -8491,7 +8491,7 @@
             <!-- implicit parameter of type 'const OT::BEInt<short int, 2>*' -->
             <parameter type-id='type-id-519' is-artificial='yes'/>
             <!-- short int -->
-            <return type-id='type-id-141'/>
+            <return type-id='type-id-142'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8531,7 +8531,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >* OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::sub_array(unsigned int, unsigned int*) -->
@@ -8677,7 +8677,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::TTCHeaderVersion1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='146' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='146' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::TTCHeaderVersion1::get_face_count() -->
@@ -8907,7 +8907,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OpenTypeFontFile::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='256' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='256' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- hb_tag_t OT::OpenTypeFontFile::get_tag() -->
@@ -8970,7 +8970,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-545' size-in-bits='64' id='type-id-251'/>
 
     <!-- uint8_t[2] -->
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='16' id='type-id-253'>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='16' id='type-id-253'>
       <!-- <anonymous range>[2] -->
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
@@ -9035,7 +9035,7 @@
     <!-- TableRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-450' size-in-bits='128' id='type-id-445'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- const OT::OffsetTable -->
@@ -9124,7 +9124,7 @@
     <!-- OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-433' size-in-bits='32' id='type-id-522'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- const OT::ArrayOf<OT::OffsetTo<OT::OffsetTable, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> > -->
@@ -9202,19 +9202,19 @@
     <!-- hb_face_t* hb_face_get_empty() -->
     <function-decl name='hb_face_get_empty' mangled-name='hb_face_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_empty'>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- hb_bool_t hb_face_is_immutable(hb_face_t*) -->
     <function-decl name='hb_face_is_immutable' mangled-name='hb_face_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_is_immutable'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- void hb_face_set_index(hb_face_t*, unsigned int) -->
     <function-decl name='hb_face_set_index' mangled-name='hb_face_set_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_index'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <!-- void -->
@@ -9223,14 +9223,14 @@
     <!-- unsigned int hb_face_get_index(hb_face_t*) -->
     <function-decl name='hb_face_get_index' mangled-name='hb_face_get_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_index'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
     <!-- void hb_face_set_upem(hb_face_t*, unsigned int) -->
     <function-decl name='hb_face_set_upem' mangled-name='hb_face_set_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_upem'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <!-- void -->
@@ -9239,7 +9239,7 @@
     <!-- void hb_face_set_glyph_count(hb_face_t*, unsigned int) -->
     <function-decl name='hb_face_set_glyph_count' mangled-name='hb_face_set_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_glyph_count'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <!-- void -->
@@ -9248,14 +9248,14 @@
     <!-- void hb_face_make_immutable(hb_face_t*) -->
     <function-decl name='hb_face_make_immutable' mangled-name='hb_face_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_make_immutable'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void* hb_face_get_user_data(hb_face_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_face_get_user_data' mangled-name='hb_face_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_user_data'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='285' column='1'/>
       <!-- void* -->
@@ -9264,7 +9264,7 @@
     <!-- hb_bool_t hb_face_set_user_data(hb_face_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_face_set_user_data' mangled-name='hb_face_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_user_data'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='264' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -9279,14 +9279,14 @@
     <!-- hb_face_t* hb_face_reference(hb_face_t*) -->
     <function-decl name='hb_face_reference' mangled-name='hb_face_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- void hb_face_destroy(hb_face_t*) -->
     <function-decl name='hb_face_destroy' mangled-name='hb_face_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_destroy'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -9299,19 +9299,19 @@
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='85' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- hb_blob_t* hb_face_reference_blob(hb_face_t*) -->
     <function-decl name='hb_face_reference_blob' mangled-name='hb_face_reference_blob' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_blob'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
       <!-- hb_blob_t* -->
       <return type-id='type-id-59'/>
     </function-decl>
     <!-- hb_blob_t* hb_face_reference_table(hb_face_t*, hb_tag_t) -->
     <function-decl name='hb_face_reference_table' mangled-name='hb_face_reference_table' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_table'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='337' column='1'/>
       <!-- hb_blob_t* -->
@@ -9324,19 +9324,19 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='164' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- unsigned int hb_face_get_glyph_count(hb_face_t*) -->
     <function-decl name='hb_face_get_glyph_count' mangled-name='hb_face_get_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_glyph_count'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
     <!-- unsigned int hb_face_get_upem(hb_face_t*) -->
     <function-decl name='hb_face_get_upem' mangled-name='hb_face_get_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_upem'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
@@ -9971,7 +9971,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::IntType<short unsigned int, 2u>* OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -10113,7 +10113,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::Offset<OT::IntType<short unsigned int, 2u> >* OT::ArrayOf<OT::Offset<OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -10255,7 +10255,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -10397,7 +10397,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -10597,7 +10597,7 @@
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
                 <parameter type-id='type-id-837' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -10606,7 +10606,7 @@
                 <!-- implicit parameter of type 'OT::Coverage::Iter*' -->
                 <parameter type-id='type-id-837' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -10634,7 +10634,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Coverage::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- unsigned int OT::Coverage::get_coverage(hb_codepoint_t) -->
@@ -10642,7 +10642,7 @@
             <!-- implicit parameter of type 'const OT::Coverage*' -->
             <parameter type-id='type-id-840' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -10779,7 +10779,7 @@
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
                 <parameter type-id='type-id-845' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -10788,7 +10788,7 @@
                 <!-- implicit parameter of type 'OT::CoverageFormat1::Iter*' -->
                 <parameter type-id='type-id-845' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -10803,7 +10803,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CoverageFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='690' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='690' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- unsigned int OT::CoverageFormat1::get_coverage(hb_codepoint_t) -->
@@ -10811,7 +10811,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat1*' -->
             <parameter type-id='type-id-844' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -10954,7 +10954,7 @@
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
                 <parameter type-id='type-id-848' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
@@ -10963,7 +10963,7 @@
                 <!-- implicit parameter of type 'OT::CoverageFormat2::Iter*' -->
                 <parameter type-id='type-id-848' is-artificial='yes'/>
                 <!-- typedef uint16_t -->
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -10978,7 +10978,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CoverageFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='803' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='803' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- unsigned int OT::CoverageFormat2::get_coverage(hb_codepoint_t) -->
@@ -10986,7 +10986,7 @@
             <!-- implicit parameter of type 'const OT::CoverageFormat2*' -->
             <parameter type-id='type-id-847' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -11085,7 +11085,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='975' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::IntType<short unsigned int, 2u>& OT::HeadlessArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >::operator[](unsigned int) -->
@@ -11177,7 +11177,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Ligature::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='701' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='701' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Ligature::closure(OT::hb_closure_context_t*) -->
@@ -11280,7 +11280,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSet::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::LigatureSet::closure(OT::hb_closure_context_t*) -->
@@ -11393,7 +11393,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigatureSubstFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::LigatureSubstFormat1::closure(OT::hb_closure_context_t*) -->
@@ -11523,7 +11523,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Lookup::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::Lookup::get_subtable_count() -->
@@ -11549,7 +11549,7 @@
             <!-- implicit parameter of type 'const OT::Lookup*' -->
             <parameter type-id='type-id-378' is-artificial='yes'/>
             <!-- typedef uint32_t -->
-            <return type-id='type-id-106'/>
+            <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -11562,7 +11562,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'typedef uint32_t' -->
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- bool -->
@@ -11607,11 +11607,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Anchor& OT::OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -11679,11 +11679,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::AnchorMatrix& OT::OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -11766,11 +11766,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <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> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >& OT::OffsetTo<OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<short unsigned int, 2u> >, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -11838,11 +11838,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::AttachList& OT::OffsetTo<OT::AttachList, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -11910,11 +11910,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::CaretValue& OT::OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -11982,11 +11982,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::ChainRule& OT::OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12054,11 +12054,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::ChainRuleSet& OT::OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12126,11 +12126,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::ClassDef& OT::OffsetTo<OT::ClassDef, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12198,11 +12198,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::CmapSubtable& OT::OffsetTo<OT::CmapSubtable, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
@@ -12270,11 +12270,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Coverage& OT::OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12342,11 +12342,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Coverage& OT::OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
@@ -12414,11 +12414,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Device& OT::OffsetTo<OT::Device, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12486,11 +12486,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Feature& OT::OffsetTo<OT::Feature, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12573,11 +12573,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::FeatureParams& OT::OffsetTo<OT::FeatureParams, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12660,11 +12660,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::LangSys& OT::OffsetTo<OT::LangSys, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12747,11 +12747,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::LigCaretList& OT::OffsetTo<OT::LigCaretList, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12819,11 +12819,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::LigGlyph& OT::OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12891,11 +12891,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Ligature& OT::OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -12963,11 +12963,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::LigatureSet& OT::OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13035,11 +13035,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Lookup& OT::OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13107,11 +13107,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::MarkArray& OT::OffsetTo<OT::MarkArray, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13179,11 +13179,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::MarkGlyphSets& OT::OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13251,11 +13251,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::OffsetListOf<OT::AnchorMatrix>& OT::OffsetTo<OT::OffsetListOf<OT::AnchorMatrix>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13338,11 +13338,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::OffsetListOf<OT::Lookup>& OT::OffsetTo<OT::OffsetListOf<OT::Lookup>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13410,11 +13410,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::OffsetListOf<OT::PosLookup>& OT::OffsetTo<OT::OffsetListOf<OT::PosLookup>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13482,11 +13482,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::OffsetListOf<OT::SubstLookup>& OT::OffsetTo<OT::OffsetListOf<OT::SubstLookup>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13554,11 +13554,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::PairSet& OT::OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13641,11 +13641,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::PosLookup& OT::OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13713,11 +13713,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::PosLookupSubTable& OT::OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13800,11 +13800,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::RecordListOf<OT::Feature>& OT::OffsetTo<OT::RecordListOf<OT::Feature>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13872,11 +13872,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::RecordListOf<OT::Script>& OT::OffsetTo<OT::RecordListOf<OT::Script>, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -13944,11 +13944,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Rule& OT::OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -14016,11 +14016,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::RuleSet& OT::OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -14088,11 +14088,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Script& OT::OffsetTo<OT::Script, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -14175,11 +14175,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::Sequence& OT::OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -14247,11 +14247,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >& OT::OffsetTo<OT::SortedArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
@@ -14319,11 +14319,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >& OT::OffsetTo<OT::SortedArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >, OT::IntType<unsigned int, 4u> >::operator()(void*) -->
@@ -14391,11 +14391,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::SubstLookup& OT::OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -14463,11 +14463,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::SubstLookupSubTable& OT::OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >::operator()(void*) -->
@@ -14560,11 +14560,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SingleSubstFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SingleSubstFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::SingleSubstFormat1::closure(OT::hb_closure_context_t*) -->
@@ -14675,7 +14675,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SingleSubstFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='190' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='190' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::SingleSubstFormat2::closure(OT::hb_closure_context_t*) -->
@@ -14926,7 +14926,7 @@
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
             <parameter type-id='type-id-436'/>
             <!-- parameter of type 'typedef uint32_t' -->
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
             <parameter type-id='type-id-819'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
@@ -14945,7 +14945,7 @@
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
             <parameter type-id='type-id-436'/>
             <!-- parameter of type 'typedef uint32_t' -->
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
             <parameter type-id='type-id-819'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
@@ -14966,7 +14966,7 @@
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
             <parameter type-id='type-id-436'/>
             <!-- parameter of type 'typedef uint32_t' -->
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
             <parameter type-id='type-id-819'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
@@ -14987,7 +14987,7 @@
             <!-- parameter of type 'OT::hb_serialize_context_t*' -->
             <parameter type-id='type-id-436'/>
             <!-- parameter of type 'typedef uint32_t' -->
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <!-- parameter of type 'OT::Supplier<OT::IntType<short unsigned int, 2u> >&' -->
             <parameter type-id='type-id-819'/>
             <!-- parameter of type 'OT::Supplier<unsigned int>&' -->
@@ -15167,7 +15167,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SubstLookupSubTable::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- bool OT::SubstLookupSubTable::sanitize(OT::hb_sanitize_context_t*, unsigned int) -->
@@ -15261,7 +15261,7 @@
     <!-- IntType<short unsigned int, 2u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-257' size-in-bits='16' id='type-id-817'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OT::Anchor& -->
@@ -15369,25 +15369,25 @@
     <!-- Offset<OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-862' size-in-bits='16' id='type-id-820'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::Ligature, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-602' size-in-bits='16' id='type-id-825'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::LigatureSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-603' size-in-bits='16' id='type-id-829'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- USHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-444' size-in-bits='16' id='type-id-861'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- const OT::Anchor& -->
@@ -15509,7 +15509,7 @@
     <!-- const OT::SubstLookupSubTable* -->
     <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-959'/>
     <!-- const hb_codepoint_t& -->
-    <reference-type-def kind='lvalue' type-id='type-id-154' size-in-bits='64' id='type-id-940'/>
+    <reference-type-def kind='lvalue' type-id='type-id-155' size-in-bits='64' id='type-id-940'/>
     <!-- const hb_set_digest_t* -->
     <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-945'/>
     <!-- const hb_set_t* -->
@@ -15642,11 +15642,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::AnchorFormat1::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
@@ -15654,13 +15654,13 @@
             <!-- implicit parameter of type 'const OT::AnchorFormat1*' -->
             <parameter type-id='type-id-412' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -15708,11 +15708,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat2::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::AnchorFormat2::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
@@ -15720,13 +15720,13 @@
             <!-- implicit parameter of type 'const OT::AnchorFormat2*' -->
             <parameter type-id='type-id-413' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -15778,11 +15778,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat3::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorFormat3::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::AnchorFormat3::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
@@ -15790,13 +15790,13 @@
             <!-- implicit parameter of type 'const OT::AnchorFormat3*' -->
             <parameter type-id='type-id-414' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -15836,7 +15836,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AnchorMatrix::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::Anchor& OT::AnchorMatrix::get_anchor(unsigned int, unsigned int, unsigned int, bool*) -->
@@ -15901,7 +15901,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::CmapSubtableLongGroup* OT::ArrayOf<OT::CmapSubtableLongGroup, OT::IntType<unsigned int, 4u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16043,7 +16043,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::EncodingRecord* OT::ArrayOf<OT::EncodingRecord, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16196,7 +16196,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::EntryExitRecord* OT::ArrayOf<OT::EntryExitRecord, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16338,7 +16338,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::Index* OT::ArrayOf<OT::Index, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16480,7 +16480,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::IntType<short unsigned int, 2u>* OT::ArrayOf<OT::IntType<short unsigned int, 2u>, OT::IntType<unsigned int, 4u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16622,7 +16622,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::IntType<unsigned int, 3u>* OT::ArrayOf<OT::IntType<unsigned int, 3u>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16764,7 +16764,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::LookupRecord* OT::ArrayOf<OT::LookupRecord, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -16906,7 +16906,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::MarkRecord* OT::ArrayOf<OT::MarkRecord, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -17048,7 +17048,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -17205,7 +17205,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -17347,7 +17347,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -17489,7 +17489,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -17631,7 +17631,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -17773,7 +17773,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -17915,7 +17915,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18057,7 +18057,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18199,7 +18199,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18341,7 +18341,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18498,7 +18498,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18640,7 +18640,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18797,7 +18797,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -18939,7 +18939,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -19081,7 +19081,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -19223,7 +19223,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -19365,7 +19365,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const 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> >::sub_array(unsigned int, unsigned int*) -->
@@ -19522,7 +19522,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::RangeRecord* OT::ArrayOf<OT::RangeRecord, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -19664,7 +19664,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::Record<OT::Feature>* OT::ArrayOf<OT::Record<OT::Feature>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -19806,7 +19806,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::Record<OT::LangSys>* OT::ArrayOf<OT::Record<OT::LangSys>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -19948,7 +19948,7 @@
         </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 -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::Record<OT::Script>* OT::ArrayOf<OT::Record<OT::Script>, OT::IntType<short unsigned int, 2u> >::sub_array(unsigned int, unsigned int*) -->
@@ -20090,7 +20090,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::UVSMapping* OT::ArrayOf<OT::UVSMapping, OT::IntType<unsigned int, 4u> >::sub_array(unsigned int, unsigned int*) -->
@@ -20232,7 +20232,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::UnicodeValueRange* OT::ArrayOf<OT::UnicodeValueRange, OT::IntType<unsigned int, 4u> >::sub_array(unsigned int, unsigned int*) -->
@@ -20374,7 +20374,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'>
           <!-- const OT::VariationSelectorRecord* OT::ArrayOf<OT::VariationSelectorRecord, OT::IntType<unsigned int, 4u> >::sub_array(unsigned int, unsigned int*) -->
@@ -20516,11 +20516,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='private'>
           <!-- hb_position_t OT::CaretValueFormat1::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
@@ -20528,13 +20528,13 @@
             <!-- implicit parameter of type 'const OT::CaretValueFormat1*' -->
             <parameter type-id='type-id-343' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- typedef hb_position_t -->
-            <return type-id='type-id-149'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20572,11 +20572,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat2::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='private'>
           <!-- hb_position_t OT::CaretValueFormat2::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
@@ -20584,13 +20584,13 @@
             <!-- implicit parameter of type 'const OT::CaretValueFormat2*' -->
             <parameter type-id='type-id-344' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- typedef hb_position_t -->
-            <return type-id='type-id-149'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -20632,11 +20632,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat3::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValueFormat3::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- hb_position_t OT::CaretValueFormat3::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
@@ -20644,13 +20644,13 @@
             <!-- implicit parameter of type 'const OT::CaretValueFormat3*' -->
             <parameter type-id='type-id-347' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- typedef hb_position_t -->
-            <return type-id='type-id-149'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -20699,7 +20699,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDefFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='986' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='986' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- unsigned int OT::ClassDefFormat1::get_class(hb_codepoint_t) -->
@@ -20707,7 +20707,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat1*' -->
             <parameter type-id='type-id-351' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -20790,11 +20790,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat0::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat0::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::CmapSubtableFormat0::get_glyph(hb_codepoint_t, hb_codepoint_t*) -->
@@ -20802,9 +20802,9 @@
             <!-- implicit parameter of type 'const OT::CmapSubtableFormat0*' -->
             <parameter type-id='type-id-278' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -20848,7 +20848,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat14::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='389' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- OT::glyph_variant_t OT::CmapSubtableFormat14::get_glyph_variant(hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
@@ -20856,11 +20856,11 @@
             <!-- implicit parameter of type 'const OT::CmapSubtableFormat14*' -->
             <parameter type-id='type-id-295' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- enum OT::glyph_variant_t -->
             <return type-id='type-id-1227'/>
           </function-decl>
@@ -20933,7 +20933,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableFormat4::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='171' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::CmapSubtableFormat4::get_glyph(hb_codepoint_t, hb_codepoint_t*) -->
@@ -20941,9 +20941,9 @@
             <!-- implicit parameter of type 'const OT::CmapSubtableFormat4*' -->
             <parameter type-id='type-id-279' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -21004,7 +21004,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat12>::get_glyph(unsigned int, hb_codepoint_t*) -->
@@ -21014,7 +21014,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -21075,7 +21075,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::CmapSubtableLongSegmented<OT::CmapSubtableFormat13>::get_glyph(unsigned int, hb_codepoint_t*) -->
@@ -21085,7 +21085,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -21146,7 +21146,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::CmapSubtableTrimmed<OT::IntType<short unsigned int, 2u> >::get_glyph(unsigned int, hb_codepoint_t*) -->
@@ -21156,7 +21156,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -21217,7 +21217,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::CmapSubtableTrimmed<OT::IntType<unsigned int, 4u> >::get_glyph(unsigned int, hb_codepoint_t*) -->
@@ -21227,7 +21227,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -21288,7 +21288,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat3::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ContextFormat3::closure(OT::hb_closure_context_t*) -->
@@ -21402,7 +21402,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Device::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- hb_position_t OT::Device::get_x_delta(hb_font_t*) -->
@@ -21410,9 +21410,9 @@
             <!-- implicit parameter of type 'const OT::Device*' -->
             <parameter type-id='type-id-345' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- typedef hb_position_t -->
-            <return type-id='type-id-149'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -21421,9 +21421,9 @@
             <!-- implicit parameter of type 'const OT::Device*' -->
             <parameter type-id='type-id-345' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- typedef hb_position_t -->
-            <return type-id='type-id-149'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -21507,11 +21507,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::EncodingRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='475' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::EncodingRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='475' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- int OT::EncodingRecord::cmp(const OT::EncodingRecord&) -->
@@ -21565,11 +21565,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ExtensionFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ExtensionFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::ExtensionFormat1::get_type() -->
@@ -21640,7 +21640,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Feature::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::Feature::get_lookup_count() -->
@@ -21752,7 +21752,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsCharacterVariants::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::FeatureParamsCharacterVariants::sanitize(OT::hb_sanitize_context_t*) -->
@@ -21810,11 +21810,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsSize::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsSize::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::FeatureParamsSize::sanitize(OT::hb_sanitize_context_t*) -->
@@ -21851,11 +21851,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsStylisticSet::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::FeatureParamsStylisticSet::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::FeatureParamsStylisticSet::sanitize(OT::hb_sanitize_context_t*) -->
@@ -21896,7 +21896,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LangSys::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::LangSys::get_feature_count() -->
@@ -22124,11 +22124,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkBasePosFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkBasePosFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::MarkBasePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -22212,11 +22212,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkLigPosFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkLigPosFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::MarkLigPosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -22300,11 +22300,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkMarkPosFormat1::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkMarkPosFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::MarkMarkPosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -22372,11 +22372,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::MarkRecord::sanitize(OT::hb_sanitize_context_t*, void*) -->
@@ -22516,11 +22516,11 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Offset<OT::IntType<short unsigned int, 2u> >::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Offset<OT::IntType<short unsigned int, 2u> >::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::Offset<OT::IntType<short unsigned int, 2u> >::is_null() -->
@@ -22581,7 +22581,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::PairPosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -22686,7 +22686,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairPosFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::PairPosFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -22784,7 +22784,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PairSet::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::PairSet::collect_glyphs(OT::hb_collect_glyphs_context_t*, const OT::ValueFormat*) -->
@@ -22864,11 +22864,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::Feature>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::Feature>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- int OT::Record<OT::Feature>::cmp(unsigned int) -->
@@ -22922,11 +22922,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::LangSys>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::LangSys>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- int OT::Record<OT::LangSys>::cmp(unsigned int) -->
@@ -22980,11 +22980,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::Script>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Record<OT::Script>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- int OT::Record<OT::Script>::cmp(unsigned int) -->
@@ -23130,7 +23130,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::SinglePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -23219,7 +23219,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::SinglePosFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::SinglePosFormat2::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -23409,11 +23409,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::VariationSelectorRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='364' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::VariationSelectorRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='364' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- OT::glyph_variant_t OT::VariationSelectorRecord::get_glyph(hb_codepoint_t, hb_codepoint_t*, void*) -->
@@ -23421,9 +23421,9 @@
             <!-- implicit parameter of type 'const OT::VariationSelectorRecord*' -->
             <parameter type-id='type-id-294' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-20'/>
             <!-- enum OT::glyph_variant_t -->
@@ -23550,11 +23550,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::_hea::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='88' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::_hea::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='88' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::_hea::sanitize(OT::hb_sanitize_context_t*) -->
@@ -23595,7 +23595,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::cmap::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='510' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- const OT::CmapSubtable* OT::cmap::find_subtable(unsigned int, unsigned int) -->
@@ -23694,43 +23694,43 @@
     <!-- CmapSubtableLongGroup[1] -->
     <array-type-def dimensions='1' type-id='type-id-1294' size-in-bits='96' id='type-id-1055'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- EncodingRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-795' size-in-bits='64' id='type-id-1061'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- EntryExitRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-1295' size-in-bits='32' id='type-id-1066'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- Index[1] -->
     <array-type-def dimensions='1' type-id='type-id-1296' size-in-bits='16' id='type-id-1072'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- IntType<unsigned int, 3u>[1] -->
     <array-type-def dimensions='1' type-id='type-id-1297' size-in-bits='24' id='type-id-1079'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- LookupRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-1298' size-in-bits='32' id='type-id-1085'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- MarkRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-805' size-in-bits='32' id='type-id-1091'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OT::AlternateSubst* -->
@@ -24014,151 +24014,151 @@
     <!-- OffsetTo<OT::Anchor, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-585' size-in-bits='16' id='type-id-1052'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::AnchorMatrix, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-586' size-in-bits='16' id='type-id-1096'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </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-587' size-in-bits='16' id='type-id-1101'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::CaretValue, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-589' size-in-bits='16' id='type-id-1106'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::ChainRule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-590' size-in-bits='16' id='type-id-1111'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::ChainRuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-591' size-in-bits='16' id='type-id-1116'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-594' size-in-bits='16' id='type-id-1121'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::Coverage, OT::IntType<unsigned int, 4u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-595' size-in-bits='32' id='type-id-1126'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::LigGlyph, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-601' size-in-bits='16' id='type-id-1131'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::Lookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-604' size-in-bits='16' id='type-id-1136'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::PairSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-611' size-in-bits='16' id='type-id-1141'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::PosLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-612' size-in-bits='16' id='type-id-1146'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::PosLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-613' size-in-bits='16' id='type-id-1151'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::Rule, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-616' size-in-bits='16' id='type-id-1156'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::RuleSet, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-617' size-in-bits='16' id='type-id-1161'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::Sequence, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-619' size-in-bits='16' id='type-id-1166'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookup, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-622' size-in-bits='16' id='type-id-1171'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OffsetTo<OT::SubstLookupSubTable, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-623' size-in-bits='16' id='type-id-1176'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- RangeRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-1299' size-in-bits='48' id='type-id-1181'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- Record<OT::Feature>[1] -->
     <array-type-def dimensions='1' type-id='type-id-809' size-in-bits='48' id='type-id-1187'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- Record<OT::LangSys>[1] -->
     <array-type-def dimensions='1' type-id='type-id-810' size-in-bits='48' id='type-id-1192'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- Record<OT::Script>[1] -->
     <array-type-def dimensions='1' type-id='type-id-811' size-in-bits='48' id='type-id-1197'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- UVSMapping[1] -->
     <array-type-def dimensions='1' type-id='type-id-1331' size-in-bits='40' id='type-id-1202'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- UnicodeValueRange[1] -->
     <array-type-def dimensions='1' type-id='type-id-1332' size-in-bits='32' id='type-id-1208'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- VariationSelectorRecord[1] -->
     <array-type-def dimensions='1' type-id='type-id-814' size-in-bits='88' id='type-id-1214'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- bool* -->
@@ -24373,7 +24373,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AlternateSubstFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::AlternateSubstFormat1::closure(OT::hb_closure_context_t*) -->
@@ -24508,7 +24508,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Anchor::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='339' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='339' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Anchor::get_anchor(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
@@ -24516,13 +24516,13 @@
             <!-- implicit parameter of type 'const OT::Anchor*' -->
             <parameter type-id='type-id-1353' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -24562,7 +24562,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::AttachList::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- unsigned int OT::AttachList::get_attach_points(hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
@@ -24570,7 +24570,7 @@
             <!-- implicit parameter of type 'const OT::AttachList*' -->
             <parameter type-id='type-id-1355' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -24642,7 +24642,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CaretValue::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='200' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='200' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- hb_position_t OT::CaretValue::get_caret_value(hb_font_t*, hb_direction_t, hb_codepoint_t) -->
@@ -24650,13 +24650,13 @@
             <!-- implicit parameter of type 'const OT::CaretValue*' -->
             <parameter type-id='type-id-1358' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- typedef hb_position_t -->
-            <return type-id='type-id-149'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -24798,7 +24798,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainRule::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ChainRule::closure(OT::hb_closure_context_t*, OT::ChainContextClosureLookupContext&) -->
@@ -24883,7 +24883,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainRuleSet::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1808' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1808' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::ChainRuleSet::closure(OT::hb_closure_context_t*, OT::ChainContextClosureLookupContext&) -->
@@ -24994,7 +24994,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDef::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- unsigned int OT::ClassDef::get_class(hb_codepoint_t) -->
@@ -25002,7 +25002,7 @@
             <!-- implicit parameter of type 'const OT::ClassDef*' -->
             <parameter type-id='type-id-1376' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -25101,7 +25101,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtable::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='448' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::CmapSubtable::get_glyph(hb_codepoint_t, hb_codepoint_t*) -->
@@ -25109,9 +25109,9 @@
             <!-- implicit parameter of type 'const OT::CmapSubtable*' -->
             <parameter type-id='type-id-1289' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -25122,11 +25122,11 @@
             <!-- implicit parameter of type 'const OT::CmapSubtable*' -->
             <parameter type-id='type-id-1289' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'hb_codepoint_t*' -->
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <!-- enum OT::glyph_variant_t -->
             <return type-id='type-id-1227'/>
           </function-decl>
@@ -25401,11 +25401,11 @@
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static const unsigned int OT::FeatureParams::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
           <!-- static const unsigned int OT::FeatureParams::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::FeatureParams::sanitize(OT::hb_sanitize_context_t*, hb_tag_t) -->
@@ -25477,7 +25477,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigCaretList::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='269' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='269' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::LigCaretList::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
@@ -25485,17 +25485,17 @@
             <!-- implicit parameter of type 'const OT::LigCaretList*' -->
             <parameter type-id='type-id-1398' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-60'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -25540,7 +25540,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LigGlyph::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='233' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='233' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::LigGlyph::get_lig_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, hb_position_t*) -->
@@ -25548,17 +25548,17 @@
             <!-- implicit parameter of type 'const OT::LigGlyph*' -->
             <parameter type-id='type-id-1401' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-60'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -25655,7 +25655,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkGlyphSets::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='317' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='317' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::MarkGlyphSets::covers(unsigned int, hb_codepoint_t) -->
@@ -25665,7 +25665,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -25709,7 +25709,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MultipleSubstFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::MultipleSubstFormat1::closure(OT::hb_closure_context_t*) -->
@@ -26132,7 +26132,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::PosLookupSubTable::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1439' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1439' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::PosLookupSubTable::sanitize(OT::hb_sanitize_context_t*, unsigned int) -->
@@ -26280,7 +26280,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ReverseChainSingleSubstFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ReverseChainSingleSubstFormat1::closure(OT::hb_closure_context_t*) -->
@@ -26378,7 +26378,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Rule::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::Rule::closure(OT::hb_closure_context_t*, OT::ContextClosureLookupContext&) -->
@@ -26472,7 +26472,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::RuleSet::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1245' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1245' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::RuleSet::closure(OT::hb_closure_context_t*, OT::ContextClosureLookupContext&) -->
@@ -26570,7 +26570,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Script::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- unsigned int OT::Script::get_lang_sys_count() -->
@@ -26691,7 +26691,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Sequence::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::Sequence::closure(OT::hb_closure_context_t*) -->
@@ -26965,7 +26965,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- const unsigned int -->
-            <return type-id='type-id-75'/>
+            <return type-id='type-id-76'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -27049,15 +27049,15 @@
             <!-- implicit parameter of type 'const OT::ValueFormat*' -->
             <parameter type-id='type-id-1265' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'void*' -->
             <parameter type-id='type-id-20'/>
             <!-- parameter of type 'const OT::Value*' -->
             <parameter type-id='type-id-1476'/>
             <!-- parameter of type 'hb_glyph_position_t&' -->
-            <parameter type-id='type-id-82'/>
+            <parameter type-id='type-id-83'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27208,11 +27208,11 @@
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
               <!-- hb_mask_t OT::hb_apply_context_t::matcher_t::mask -->
-              <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='387' column='1'/>
+              <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='387' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='96'>
               <!-- uint8_t OT::hb_apply_context_t::matcher_t::syllable -->
-              <var-decl name='syllable' 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='388' column='1'/>
+              <var-decl name='syllable' type-id='type-id-145' 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'>
               <!-- OT::hb_apply_context_t::matcher_t::match_func_t OT::hb_apply_context_t::matcher_t::match_func -->
@@ -27270,7 +27270,7 @@
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
                 <parameter type-id='type-id-1486' is-artificial='yes'/>
                 <!-- parameter of type 'typedef hb_mask_t' -->
-                <parameter type-id='type-id-86'/>
+                <parameter type-id='type-id-87'/>
                 <!-- void -->
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -27281,7 +27281,7 @@
                 <!-- implicit parameter of type 'OT::hb_apply_context_t::matcher_t*' -->
                 <parameter type-id='type-id-1486' is-artificial='yes'/>
                 <!-- parameter of type 'typedef uint8_t' -->
-                <parameter type-id='type-id-144'/>
+                <parameter type-id='type-id-145'/>
                 <!-- void -->
                 <return type-id='type-id-5'/>
               </function-decl>
@@ -27305,7 +27305,7 @@
                 <!-- implicit parameter of type 'const OT::hb_apply_context_t::matcher_t*' -->
                 <parameter type-id='type-id-1487' is-artificial='yes'/>
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
-                <parameter type-id='type-id-84'/>
+                <parameter type-id='type-id-85'/>
                 <!-- parameter of type 'const OT::USHORT*' -->
                 <parameter type-id='type-id-1488'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_match_t -->
@@ -27320,7 +27320,7 @@
                 <!-- parameter of type 'const OT::hb_apply_context_t*' -->
                 <parameter type-id='type-id-1489'/>
                 <!-- parameter of type 'const hb_glyph_info_t&' -->
-                <parameter type-id='type-id-84'/>
+                <parameter type-id='type-id-85'/>
                 <!-- enum OT::hb_apply_context_t::matcher_t::may_skip_t -->
                 <return type-id='type-id-1483'/>
               </function-decl>
@@ -27553,7 +27553,7 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_apply_context_t::max_debug_depth -->
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned int OT::hb_apply_context_t::table_index -->
@@ -27561,23 +27561,23 @@
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- hb_font_t* OT::hb_apply_context_t::font -->
-          <var-decl name='font' type-id='type-id-157' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
+          <var-decl name='font' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- hb_face_t* OT::hb_apply_context_t::face -->
-          <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
+          <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
           <!-- hb_buffer_t* OT::hb_apply_context_t::buffer -->
-          <var-decl name='buffer' type-id='type-id-79' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
+          <var-decl name='buffer' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
           <!-- hb_direction_t OT::hb_apply_context_t::direction -->
-          <var-decl name='direction' type-id='type-id-125' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='286' column='1'/>
+          <var-decl name='direction' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='286' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='288'>
           <!-- hb_mask_t OT::hb_apply_context_t::lookup_mask -->
-          <var-decl name='lookup_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='287' column='1'/>
+          <var-decl name='lookup_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='287' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <!-- bool OT::hb_apply_context_t::auto_zwj -->
@@ -27653,9 +27653,9 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'hb_buffer_t*' -->
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-80'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27666,7 +27666,7 @@
             <!-- implicit parameter of type 'OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-855' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_mask_t' -->
-            <parameter type-id='type-id-86'/>
+            <parameter type-id='type-id-87'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27721,7 +27721,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1489' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'unsigned int' -->
@@ -27749,7 +27749,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1489' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'bool' -->
@@ -27766,7 +27766,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1489' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27777,7 +27777,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1489' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -27788,7 +27788,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1489' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- void -->
@@ -27801,7 +27801,7 @@
             <!-- implicit parameter of type 'const OT::hb_apply_context_t*' -->
             <parameter type-id='type-id-1489' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- void -->
@@ -28043,11 +28043,11 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_closure_context_t::max_debug_depth -->
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- hb_face_t* OT::hb_closure_context_t::face -->
-          <var-decl name='face' type-id='type-id-158' 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'/>
+          <var-decl name='face' type-id='type-id-159' 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'>
           <!-- hb_set_t* OT::hb_closure_context_t::glyphs -->
@@ -28109,7 +28109,7 @@
             <!-- implicit parameter of type 'OT::hb_closure_context_t*' -->
             <parameter type-id='type-id-852' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-159'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-842'/>
             <!-- parameter of type 'unsigned int' -->
@@ -28276,11 +28276,11 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_collect_glyphs_context_t::max_debug_depth -->
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- hb_face_t* OT::hb_collect_glyphs_context_t::face -->
-          <var-decl name='face' type-id='type-id-158' 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'/>
+          <var-decl name='face' type-id='type-id-159' 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'>
           <!-- hb_set_t* OT::hb_collect_glyphs_context_t::before -->
@@ -28358,7 +28358,7 @@
             <!-- implicit parameter of type 'OT::hb_collect_glyphs_context_t*' -->
             <parameter type-id='type-id-853' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-159'/>
             <!-- parameter of type 'hb_set_t*' -->
             <parameter type-id='type-id-842'/>
             <!-- parameter of type 'hb_set_t*' -->
@@ -28626,7 +28626,7 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_get_coverage_context_t::max_debug_depth -->
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- unsigned int OT::hb_get_coverage_context_t::debug_depth -->
@@ -28888,15 +28888,15 @@
         </member-type>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::hb_would_apply_context_t::max_debug_depth -->
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <!-- hb_face_t* OT::hb_would_apply_context_t::face -->
-          <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
+          <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
           <!-- const hb_codepoint_t* OT::hb_would_apply_context_t::glyphs -->
-          <var-decl name='glyphs' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='116' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <!-- unsigned int OT::hb_would_apply_context_t::len -->
@@ -28943,9 +28943,9 @@
             <!-- implicit parameter of type 'OT::hb_would_apply_context_t*' -->
             <parameter type-id='type-id-854' is-artificial='yes'/>
             <!-- parameter of type 'hb_face_t*' -->
-            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-159'/>
             <!-- parameter of type 'const hb_codepoint_t*' -->
-            <parameter type-id='type-id-85'/>
+            <parameter type-id='type-id-86'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'bool' -->
@@ -29092,7 +29092,7 @@
     <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-1044'>
       <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-1528'/>
+        <typedef-decl name='elt_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1528'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_object_header_t hb_set_t::header -->
@@ -29104,27 +29104,27 @@
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_t::MAX_G -->
-        <var-decl name='MAX_G' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='321' column='1'/>
+        <var-decl name='MAX_G' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='321' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_t::SHIFT -->
-        <var-decl name='SHIFT' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='322' column='1'/>
+        <var-decl name='SHIFT' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='322' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_t::BITS -->
-        <var-decl name='BITS' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='323' column='1'/>
+        <var-decl name='BITS' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='323' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_t::MASK -->
-        <var-decl name='MASK' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='324' column='1'/>
+        <var-decl name='MASK' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='324' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_t::ELTS -->
-        <var-decl name='ELTS' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='325' column='1'/>
+        <var-decl name='ELTS' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='325' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const hb_codepoint_t hb_set_t::INVALID -->
-        <var-decl name='INVALID' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='326' column='1'/>
+        <var-decl name='INVALID' type-id='type-id-155' 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'>
         <!-- hb_set_t::elt_t hb_set_t::elts[2048] -->
@@ -29181,7 +29181,7 @@
           <!-- implicit parameter of type 'hb_set_t*' -->
           <parameter type-id='type-id-842' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -29192,9 +29192,9 @@
           <!-- implicit parameter of type 'hb_set_t*' -->
           <parameter type-id='type-id-842' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -29205,7 +29205,7 @@
           <!-- implicit parameter of type 'hb_set_t*' -->
           <parameter type-id='type-id-842' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -29216,9 +29216,9 @@
           <!-- implicit parameter of type 'hb_set_t*' -->
           <parameter type-id='type-id-842' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -29229,7 +29229,7 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -29240,9 +29240,9 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -29328,7 +29328,7 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -29339,9 +29339,9 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -29361,7 +29361,7 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- typedef hb_codepoint_t -->
-          <return type-id='type-id-68'/>
+          <return type-id='type-id-69'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -29370,7 +29370,7 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- typedef hb_codepoint_t -->
-          <return type-id='type-id-68'/>
+          <return type-id='type-id-69'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -29379,7 +29379,7 @@
           <!-- implicit parameter of type 'hb_set_t*' -->
           <parameter type-id='type-id-842' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- hb_set_t::elt_t& -->
           <return type-id='type-id-1530'/>
         </function-decl>
@@ -29390,7 +29390,7 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_set_t::elt_t -->
           <return type-id='type-id-1528'/>
         </function-decl>
@@ -29401,7 +29401,7 @@
           <!-- implicit parameter of type 'const hb_set_t*' -->
           <parameter type-id='type-id-841' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- typedef hb_set_t::elt_t -->
           <return type-id='type-id-1528'/>
         </function-decl>
@@ -29516,7 +29516,7 @@
     <!-- Value[1] -->
     <array-type-def dimensions='1' type-id='type-id-1540' size-in-bits='16' id='type-id-1531'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- bool (typedef hb_codepoint_t, const OT::USHORT&, void*)* -->
@@ -29700,9 +29700,9 @@
     <!-- const _hb_void_t& -->
     <reference-type-def kind='lvalue' type-id='type-id-1570' size-in-bits='64' id='type-id-1533'/>
     <!-- const hb_glyph_info_t* -->
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-1499'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-1499'/>
     <!-- const unsigned int* -->
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-1471'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1471'/>
     <!-- elt_t[2048] -->
     <array-type-def dimensions='1' type-id='type-id-1528' size-in-bits='65536' id='type-id-1529'>
       <!-- <anonymous range>[2048] -->
@@ -29730,7 +29730,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::ChainContextFormat1::closure(OT::hb_closure_context_t*) -->
@@ -29845,7 +29845,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ChainContextFormat2::closure(OT::hb_closure_context_t*) -->
@@ -29956,7 +29956,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ChainContextFormat3::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ChainContextFormat3::closure(OT::hb_closure_context_t*) -->
@@ -30053,7 +30053,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ClassDefFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1045' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1045' column='1'/>
         </data-member>
         <member-function access='private'>
           <!-- unsigned int OT::ClassDefFormat2::get_class(hb_codepoint_t) -->
@@ -30061,7 +30061,7 @@
             <!-- implicit parameter of type 'const OT::ClassDefFormat2*' -->
             <parameter type-id='type-id-1579' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -30141,9 +30141,9 @@
             <!-- parameter of type 'const OT::CmapSubtableLongGroup&' -->
             <parameter type-id='type-id-1057'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- typedef hb_codepoint_t -->
-            <return type-id='type-id-68'/>
+            <return type-id='type-id-69'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -30159,9 +30159,9 @@
             <!-- parameter of type 'const OT::CmapSubtableLongGroup&' -->
             <parameter type-id='type-id-1057'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- typedef hb_codepoint_t -->
-            <return type-id='type-id-68'/>
+            <return type-id='type-id-69'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -30190,11 +30190,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongGroup::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CmapSubtableLongGroup::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- int OT::CmapSubtableLongGroup::cmp(hb_codepoint_t) -->
@@ -30202,7 +30202,7 @@
             <!-- implicit parameter of type 'const OT::CmapSubtableLongGroup*' -->
             <parameter type-id='type-id-1056' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- int -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -30246,7 +30246,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ContextFormat1::closure(OT::hb_closure_context_t*) -->
@@ -30353,7 +30353,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::ContextFormat2::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::ContextFormat2::closure(OT::hb_closure_context_t*) -->
@@ -30525,11 +30525,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::EntryExitRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::EntryExitRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::EntryExitRecord::sanitize(OT::hb_sanitize_context_t*, void*) -->
@@ -30569,7 +30569,7 @@
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::Index::NOT_FOUND_INDEX -->
-          <var-decl name='NOT_FOUND_INDEX' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='676' column='1'/>
+          <var-decl name='NOT_FOUND_INDEX' type-id='type-id-76' 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>
     </namespace-decl>
@@ -30582,11 +30582,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 3u>::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::IntType<unsigned int, 3u>::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::IntType<unsigned int, 3u>::set(unsigned int) -->
@@ -30698,11 +30698,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LookupRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LookupRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::LookupRecord::sanitize(OT::hb_sanitize_context_t*) -->
@@ -30805,7 +30805,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::MarkGlyphSetsFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- bool OT::MarkGlyphSetsFormat1::covers(unsigned int, hb_codepoint_t) -->
@@ -30815,7 +30815,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -31147,11 +31147,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::RangeRecord::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::RangeRecord::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- int OT::RangeRecord::cmp(hb_codepoint_t) -->
@@ -31159,7 +31159,7 @@
             <!-- implicit parameter of type 'const OT::RangeRecord*' -->
             <parameter type-id='type-id-1182' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- int -->
             <return type-id='type-id-4'/>
           </function-decl>
@@ -31564,11 +31564,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UVSMapping::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UVSMapping::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- int OT::UVSMapping::cmp(const hb_codepoint_t&) -->
@@ -31616,11 +31616,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UnicodeValueRange::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='300' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::UnicodeValueRange::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='300' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- int OT::UnicodeValueRange::cmp(const hb_codepoint_t&) -->
@@ -31721,7 +31721,7 @@
     </class-decl>
     <namespace-decl name='OT'>
       <!-- typedef uint8_t OT::BYTE -->
-      <typedef-decl name='BYTE' type-id='type-id-144' 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-1292'/>
+      <typedef-decl name='BYTE' type-id='type-id-145' 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-1292'/>
     </namespace-decl>
     <!-- typedef OT::hb_apply_context_t::return_t (OT::hb_apply_context_t*, unsigned int)* -->
     <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-1497'/>
@@ -31866,7 +31866,7 @@
     <!-- bool (hb_codepoint_t, const OT::USHORT&, void*) -->
     <function-type size-in-bits='64' id='type-id-1541'>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'const OT::USHORT&' -->
       <parameter type-id='type-id-1643'/>
       <!-- parameter of type 'void*' -->
@@ -32049,7 +32049,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::CursivePosFormat1::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <!-- void OT::CursivePosFormat1::collect_glyphs(OT::hb_collect_glyphs_context_t*) -->
@@ -32342,15 +32342,15 @@
     <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-1622'>
       <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
+        <var-decl name='mask_bytes' type-id='type-id-76' 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>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 4u>::mask_bits -->
-        <var-decl name='mask_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
+        <var-decl name='mask_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 4u>::num_bits -->
-        <var-decl name='num_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
+        <var-decl name='num_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- unsigned long int hb_set_digest_lowest_bits_t<long unsigned int, 4u>::mask -->
@@ -32512,15 +32512,15 @@
     <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-1660'>
       <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
+        <var-decl name='mask_bytes' type-id='type-id-76' 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>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 0u>::mask_bits -->
-        <var-decl name='mask_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
+        <var-decl name='mask_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 0u>::num_bits -->
-        <var-decl name='num_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
+        <var-decl name='num_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- unsigned long int hb_set_digest_lowest_bits_t<long unsigned int, 0u>::mask -->
@@ -32593,15 +32593,15 @@
     <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-1661'>
       <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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
+        <var-decl name='mask_bytes' type-id='type-id-76' 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>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 9u>::mask_bits -->
-        <var-decl name='mask_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
+        <var-decl name='mask_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int hb_set_digest_lowest_bits_t<long unsigned int, 9u>::num_bits -->
-        <var-decl name='num_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
+        <var-decl name='num_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <!-- unsigned long int hb_set_digest_lowest_bits_t<long unsigned int, 9u>::mask -->
@@ -32671,7 +32671,7 @@
       </member-function>
     </class-decl>
     <!-- uint8_t[3] -->
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='24' id='type-id-1644'>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='24' id='type-id-1644'>
       <!-- <anonymous range>[3] -->
       <subrange length='3' type-id='type-id-42' id='type-id-1680'/>
 
@@ -32746,7 +32746,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GDEF::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='426' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='426' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::GDEF::has_glyph_classes() -->
@@ -32763,7 +32763,7 @@
             <!-- implicit parameter of type 'const OT::GDEF*' -->
             <parameter type-id='type-id-1685' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -32796,7 +32796,7 @@
             <!-- implicit parameter of type 'const OT::GDEF*' -->
             <parameter type-id='type-id-1685' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -32816,7 +32816,7 @@
             <!-- implicit parameter of type 'const OT::GDEF*' -->
             <parameter type-id='type-id-1685' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'unsigned int*' -->
@@ -32842,17 +32842,17 @@
             <!-- implicit parameter of type 'const OT::GDEF*' -->
             <parameter type-id='type-id-1685' is-artificial='yes'/>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'enum hb_direction_t' -->
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-126'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'unsigned int*' -->
             <parameter type-id='type-id-60'/>
             <!-- parameter of type 'hb_position_t*' -->
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -32874,7 +32874,7 @@
             <!-- parameter of type 'unsigned int' -->
             <parameter type-id='type-id-10'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- bool -->
             <return type-id='type-id-7'/>
           </function-decl>
@@ -32896,7 +32896,7 @@
             <!-- implicit parameter of type 'const OT::GDEF*' -->
             <parameter type-id='type-id-1685' is-artificial='yes'/>
             <!-- parameter of type 'typedef hb_codepoint_t' -->
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <!-- unsigned int -->
             <return type-id='type-id-10'/>
           </function-decl>
@@ -32938,7 +32938,7 @@
     <!-- OffsetTo<OT::MarkGlyphSets, OT::IntType<short unsigned int, 2u> >[1] -->
     <array-type-def dimensions='1' type-id='type-id-606' size-in-bits='16' id='type-id-1684'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- bool (hb_set_t*, const OT::USHORT&, void*)* -->
@@ -32979,19 +32979,19 @@
     <!-- hb_font_funcs_t* hb_font_funcs_get_empty() -->
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
       <!-- hb_font_funcs_t* -->
-      <return type-id='type-id-159'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_bool_t hb_font_funcs_is_immutable(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_is_immutable' mangled-name='hb_font_funcs_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_is_immutable'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- void hb_font_funcs_set_glyph_func(hb_font_funcs_t*, hb_font_get_glyph_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_func' mangled-name='hb_font_funcs_set_glyph_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_func_t' -->
       <parameter type-id='type-id-182' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33004,7 +33004,7 @@
     <!-- void hb_font_funcs_set_glyph_h_advance_func(hb_font_funcs_t*, hb_font_get_glyph_h_advance_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_h_advance_func' mangled-name='hb_font_funcs_set_glyph_h_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_advance_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_h_advance_func_t' -->
       <parameter type-id='type-id-183' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33017,7 +33017,7 @@
     <!-- void hb_font_funcs_set_glyph_v_advance_func(hb_font_funcs_t*, hb_font_get_glyph_v_advance_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_v_advance_func' mangled-name='hb_font_funcs_set_glyph_v_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_advance_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_advance_func_t' -->
       <parameter type-id='type-id-184' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33030,7 +33030,7 @@
     <!-- void hb_font_funcs_set_glyph_h_origin_func(hb_font_funcs_t*, hb_font_get_glyph_h_origin_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_h_origin_func' mangled-name='hb_font_funcs_set_glyph_h_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_origin_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_h_origin_func_t' -->
       <parameter type-id='type-id-185' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33043,7 +33043,7 @@
     <!-- void hb_font_funcs_set_glyph_v_origin_func(hb_font_funcs_t*, hb_font_get_glyph_v_origin_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_v_origin_func' mangled-name='hb_font_funcs_set_glyph_v_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_origin_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_origin_func_t' -->
       <parameter type-id='type-id-186' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33056,7 +33056,7 @@
     <!-- void hb_font_funcs_set_glyph_h_kerning_func(hb_font_funcs_t*, hb_font_get_glyph_h_kerning_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_h_kerning_func' mangled-name='hb_font_funcs_set_glyph_h_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_kerning_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_h_kerning_func_t' -->
       <parameter type-id='type-id-187' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33069,7 +33069,7 @@
     <!-- void hb_font_funcs_set_glyph_v_kerning_func(hb_font_funcs_t*, hb_font_get_glyph_v_kerning_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_v_kerning_func' mangled-name='hb_font_funcs_set_glyph_v_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_kerning_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_v_kerning_func_t' -->
       <parameter type-id='type-id-188' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33082,7 +33082,7 @@
     <!-- void hb_font_funcs_set_glyph_extents_func(hb_font_funcs_t*, hb_font_get_glyph_extents_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_extents_func' mangled-name='hb_font_funcs_set_glyph_extents_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_extents_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_extents_func_t' -->
       <parameter type-id='type-id-189' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33095,7 +33095,7 @@
     <!-- void hb_font_funcs_set_glyph_contour_point_func(hb_font_funcs_t*, hb_font_get_glyph_contour_point_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_contour_point_func' mangled-name='hb_font_funcs_set_glyph_contour_point_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_contour_point_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_contour_point_func_t' -->
       <parameter type-id='type-id-190' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33108,7 +33108,7 @@
     <!-- void hb_font_funcs_set_glyph_name_func(hb_font_funcs_t*, hb_font_get_glyph_name_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_name_func' mangled-name='hb_font_funcs_set_glyph_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_name_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_name_func_t' -->
       <parameter type-id='type-id-191' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33121,7 +33121,7 @@
     <!-- void hb_font_funcs_set_glyph_from_name_func(hb_font_funcs_t*, hb_font_get_glyph_from_name_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_funcs_set_glyph_from_name_func' mangled-name='hb_font_funcs_set_glyph_from_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_from_name_func'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'typedef hb_font_get_glyph_from_name_func_t' -->
       <parameter type-id='type-id-192' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33134,103 +33134,103 @@
     <!-- hb_bool_t hb_font_get_glyph(hb_font_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <function-decl name='hb_font_get_glyph' mangled-name='hb_font_get_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='variation_selector' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
+      <parameter type-id='type-id-69' name='variation_selector' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='433' column='1'/>
+      <parameter type-id='type-id-105' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='433' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_position_t hb_font_get_glyph_h_advance(hb_font_t*, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_h_advance' mangled-name='hb_font_get_glyph_h_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_advance'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
       <!-- typedef hb_position_t -->
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <!-- hb_position_t hb_font_get_glyph_v_advance(hb_font_t*, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_v_advance' mangled-name='hb_font_get_glyph_v_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_advance'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
       <!-- typedef hb_position_t -->
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_h_origin(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_h_origin' mangled-name='hb_font_get_glyph_h_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_v_origin(hb_font_t*, hb_codepoint_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_v_origin' mangled-name='hb_font_get_glyph_v_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_position_t hb_font_get_glyph_h_kerning(hb_font_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_h_kerning' mangled-name='hb_font_get_glyph_h_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_kerning'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <parameter type-id='type-id-69' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <parameter type-id='type-id-69' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <!-- typedef hb_position_t -->
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <!-- hb_position_t hb_font_get_glyph_v_kerning(hb_font_t*, hb_codepoint_t, hb_codepoint_t) -->
     <function-decl name='hb_font_get_glyph_v_kerning' mangled-name='hb_font_get_glyph_v_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_kerning'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <parameter type-id='type-id-69' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <parameter type-id='type-id-69' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
       <!-- typedef hb_position_t -->
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_contour_point(hb_font_t*, hb_codepoint_t, unsigned int, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_contour_point' mangled-name='hb_font_get_glyph_contour_point' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_name(hb_font_t*, hb_codepoint_t, char*, unsigned int) -->
     <function-decl name='hb_font_get_glyph_name' mangled-name='hb_font_get_glyph_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_name'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-61' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='612' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -33241,33 +33241,33 @@
     <!-- hb_font_t* hb_font_get_empty() -->
     <function-decl name='hb_font_get_empty' mangled-name='hb_font_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_empty'>
       <!-- hb_font_t* -->
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <!-- hb_bool_t hb_font_is_immutable(hb_font_t*) -->
     <function-decl name='hb_font_is_immutable' mangled-name='hb_font_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_is_immutable'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_font_t* hb_font_get_parent(hb_font_t*) -->
     <function-decl name='hb_font_get_parent' mangled-name='hb_font_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_parent'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <!-- hb_face_t* hb_font_get_face(hb_font_t*) -->
     <function-decl name='hb_font_get_face' mangled-name='hb_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_face'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- void hb_font_set_funcs_data(hb_font_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs_data' mangled-name='hb_font_set_funcs_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1140' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -33278,7 +33278,7 @@
     <!-- void hb_font_set_scale(hb_font_t*, int, int) -->
     <function-decl name='hb_font_set_scale' mangled-name='hb_font_set_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_scale'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1170' column='1'/>
       <!-- parameter of type 'int' -->
@@ -33291,7 +33291,7 @@
     <!-- void hb_font_get_scale(hb_font_t*, int*, int*) -->
     <function-decl name='hb_font_get_scale' mangled-name='hb_font_get_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_scale'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-1691' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
       <!-- parameter of type 'int*' -->
@@ -33302,7 +33302,7 @@
     <!-- void hb_font_set_ppem(hb_font_t*, unsigned int, unsigned int) -->
     <function-decl name='hb_font_set_ppem' mangled-name='hb_font_set_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_ppem'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1211' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -33313,7 +33313,7 @@
     <!-- void hb_font_get_ppem(hb_font_t*, unsigned int*, unsigned int*) -->
     <function-decl name='hb_font_get_ppem' mangled-name='hb_font_get_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_ppem'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1233' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -33324,70 +33324,70 @@
     <!-- void hb_font_make_immutable(hb_font_t*) -->
     <function-decl name='hb_font_make_immutable' mangled-name='hb_font_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_make_immutable'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_contour_point_for_origin(hb_font_t*, hb_codepoint_t, unsigned int, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_contour_point_for_origin' mangled-name='hb_font_get_glyph_contour_point_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point_for_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- void hb_font_get_glyph_kerning_for_direction(hb_font_t*, hb_codepoint_t, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_kerning_for_direction' mangled-name='hb_font_get_glyph_kerning_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_kerning_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
+      <parameter type-id='type-id-69' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='second_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
+      <parameter type-id='type-id-69' name='second_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_font_get_glyph_advance_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_advance_for_direction' mangled-name='hb_font_get_glyph_advance_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_advance_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_font_funcs_make_immutable(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_make_immutable' mangled-name='hb_font_funcs_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_make_immutable'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void* hb_font_get_user_data(hb_font_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_font_get_user_data' mangled-name='hb_font_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_user_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1021' column='1'/>
       <!-- void* -->
@@ -33396,7 +33396,7 @@
     <!-- void* hb_font_funcs_get_user_data(hb_font_funcs_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_font_funcs_get_user_data' mangled-name='hb_font_funcs_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_user_data'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='343' column='1'/>
       <!-- void* -->
@@ -33405,7 +33405,7 @@
     <!-- hb_bool_t hb_font_set_user_data(hb_font_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_font_set_user_data' mangled-name='hb_font_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_user_data'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1000' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33420,7 +33420,7 @@
     <!-- hb_bool_t hb_font_funcs_set_user_data(hb_font_funcs_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_font_funcs_set_user_data' mangled-name='hb_font_funcs_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_user_data'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='322' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -33435,28 +33435,28 @@
     <!-- hb_font_t* hb_font_reference(hb_font_t*) -->
     <function-decl name='hb_font_reference' mangled-name='hb_font_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_reference'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <!-- hb_font_funcs_t* hb_font_funcs_reference(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_reference' mangled-name='hb_font_funcs_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_reference'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
       <!-- hb_font_funcs_t* -->
-      <return type-id='type-id-159'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- hb_font_funcs_t* hb_font_funcs_create() -->
     <function-decl name='hb_font_funcs_create' mangled-name='hb_font_funcs_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_create'>
       <!-- hb_font_funcs_t* -->
-      <return type-id='type-id-159'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <!-- void hb_font_glyph_to_string(hb_font_t*, hb_codepoint_t, char*, unsigned int) -->
     <function-decl name='hb_font_glyph_to_string' mangled-name='hb_font_glyph_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_to_string'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
       <!-- parameter of type 'char*' -->
       <parameter type-id='type-id-61' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='808' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -33467,125 +33467,125 @@
     <!-- hb_font_t* hb_font_create(hb_face_t*) -->
     <function-decl name='hb_font_create' mangled-name='hb_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <!-- hb_font_t* hb_font_create_sub_font(hb_font_t*) -->
     <function-decl name='hb_font_create_sub_font' mangled-name='hb_font_create_sub_font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create_sub_font'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_extents(hb_font_t*, hb_codepoint_t, hb_glyph_extents_t*) -->
     <function-decl name='hb_font_get_glyph_extents' mangled-name='hb_font_get_glyph_extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
-      <parameter type-id='type-id-163' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_from_name(hb_font_t*, const char*, int, hb_codepoint_t*) -->
     <function-decl name='hb_font_get_glyph_from_name' mangled-name='hb_font_get_glyph_from_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_from_name'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-50' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
+      <parameter type-id='type-id-105' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_bool_t hb_font_glyph_from_string(hb_font_t*, const char*, int, hb_codepoint_t*) -->
     <function-decl name='hb_font_glyph_from_string' mangled-name='hb_font_glyph_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_from_string'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-50' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
+      <parameter type-id='type-id-105' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- void hb_font_subtract_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_subtract_glyph_origin_for_direction' mangled-name='hb_font_subtract_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_subtract_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_font_add_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_add_glyph_origin_for_direction' mangled-name='hb_font_add_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_add_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_font_get_glyph_origin_for_direction(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_position_t*, hb_position_t*) -->
     <function-decl name='hb_font_get_glyph_origin_for_direction' mangled-name='hb_font_get_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_origin_for_direction'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- parameter of type 'hb_position_t*' -->
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_bool_t hb_font_get_glyph_extents_for_origin(hb_font_t*, hb_codepoint_t, hb_direction_t, hb_glyph_extents_t*) -->
     <function-decl name='hb_font_get_glyph_extents_for_origin' mangled-name='hb_font_get_glyph_extents_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents_for_origin'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
       <!-- parameter of type 'hb_glyph_extents_t*' -->
-      <parameter type-id='type-id-163' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- void hb_font_funcs_destroy(hb_font_funcs_t*) -->
     <function-decl name='hb_font_funcs_destroy' mangled-name='hb_font_funcs_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_destroy'>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void hb_font_set_funcs(hb_font_t*, hb_font_funcs_t*, void*, hb_destroy_func_t) -->
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
       <!-- parameter of type 'hb_font_funcs_t*' -->
-      <parameter type-id='type-id-159' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
+      <parameter type-id='type-id-160' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1106' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -33596,7 +33596,7 @@
     <!-- void hb_font_destroy(hb_font_t*) -->
     <function-decl name='hb_font_destroy' mangled-name='hb_font_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_destroy'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -33607,12 +33607,12 @@
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
       <!-- typedef hb_language_t -->
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
     <!-- hb_tag_t hb_ot_tag_from_language(hb_language_t) -->
     <function-decl name='hb_ot_tag_from_language' mangled-name='hb_ot_tag_from_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_from_language'>
       <!-- parameter of type 'typedef hb_language_t' -->
-      <parameter type-id='type-id-126' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1'/>
+      <parameter type-id='type-id-127' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1'/>
       <!-- typedef hb_tag_t -->
       <return type-id='type-id-180'/>
     </function-decl>
@@ -33621,12 +33621,12 @@
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <!-- void hb_ot_tags_from_script(hb_script_t, hb_tag_t*, hb_tag_t*) -->
     <function-decl name='hb_ot_tags_from_script' mangled-name='hb_ot_tags_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tags_from_script'>
       <!-- parameter of type 'enum hb_script_t' -->
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
       <parameter type-id='type-id-1460' name='script_tag_1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='131' column='1'/>
       <!-- parameter of type 'hb_tag_t*' -->
@@ -33670,21 +33670,21 @@
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
       <!-- typedef hb_codepoint_t -->
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <!-- hb_codepoint_t hb_set_get_max(const hb_set_t*) -->
     <function-decl name='hb_set_get_max' mangled-name='hb_set_get_max' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_max'>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
       <!-- typedef hb_codepoint_t -->
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <!-- hb_bool_t hb_set_has(const hb_set_t*, hb_codepoint_t) -->
     <function-decl name='hb_set_has' mangled-name='hb_set_has' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_has'>
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='201' column='1'/>
+      <parameter type-id='type-id-69' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='201' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
@@ -33745,9 +33745,9 @@
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-842' 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-68' 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-69' 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' -->
-      <parameter type-id='type-id-68' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
+      <parameter type-id='type-id-69' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -33756,7 +33756,7 @@
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-842' 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-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
+      <parameter type-id='type-id-69' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -33765,9 +33765,9 @@
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-842' 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-68' 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-69' 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' -->
-      <parameter type-id='type-id-68' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
+      <parameter type-id='type-id-69' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -33776,7 +33776,7 @@
       <!-- parameter of type 'hb_set_t*' -->
       <parameter type-id='type-id-842' 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-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
+      <parameter type-id='type-id-69' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -33842,9 +33842,9 @@
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='467' column='1'/>
+      <parameter type-id='type-id-105' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='467' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='468' column='1'/>
+      <parameter type-id='type-id-105' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='468' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
@@ -33853,7 +33853,7 @@
       <!-- parameter of type 'const hb_set_t*' -->
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='447' column='1'/>
+      <parameter type-id='type-id-105' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='447' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
@@ -33866,9 +33866,9 @@
     <!-- hb_bool_t hb_shape_full(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-229' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -33881,9 +33881,9 @@
     <!-- void hb_shape(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int) -->
     <function-decl name='hb_shape' mangled-name='hb_shape' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-229' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -33894,7 +33894,7 @@
     <!-- const char** hb_shape_list_shapers() -->
     <function-decl name='hb_shape_list_shapers' mangled-name='hb_shape_list_shapers' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_list_shapers'>
       <!-- const char** -->
-      <return type-id='type-id-62'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <!-- void hb_feature_to_string(hb_feature_t*, char*, unsigned int) -->
     <function-decl name='hb_feature_to_string' mangled-name='hb_feature_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_feature_to_string'>
@@ -33937,9 +33937,9 @@
       <!-- parameter of type 'hb_shape_plan_t*' -->
       <parameter type-id='type-id-176'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-80'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-229'/>
       <!-- parameter of type 'unsigned int' -->
@@ -33988,7 +33988,7 @@
     <!-- hb_shape_plan_t* hb_shape_plan_create(hb_face_t*, const hb_segment_properties_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_plan_create' mangled-name='hb_shape_plan_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
       <parameter type-id='type-id-241' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
@@ -34003,7 +34003,7 @@
     <!-- hb_shape_plan_t* hb_shape_plan_create_cached(hb_face_t*, const hb_segment_properties_t*, const hb_feature_t*, unsigned int, const char* const*) -->
     <function-decl name='hb_shape_plan_create_cached' mangled-name='hb_shape_plan_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create_cached'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
       <!-- parameter of type 'const hb_segment_properties_t*' -->
       <parameter type-id='type-id-241' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
@@ -34020,28 +34020,28 @@
     <!-- hb_unicode_funcs_t* hb_unicode_funcs_get_empty() -->
     <function-decl name='hb_unicode_funcs_get_empty' mangled-name='hb_unicode_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_empty'>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <!-- hb_bool_t hb_unicode_funcs_is_immutable(hb_unicode_funcs_t*) -->
     <function-decl name='hb_unicode_funcs_is_immutable' mangled-name='hb_unicode_funcs_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_is_immutable'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='330' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='330' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_unicode_funcs_t* hb_unicode_funcs_get_parent(hb_unicode_funcs_t*) -->
     <function-decl name='hb_unicode_funcs_get_parent' mangled-name='hb_unicode_funcs_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_parent'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <!-- void hb_unicode_funcs_set_combining_class_func(hb_unicode_funcs_t*, hb_unicode_combining_class_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_combining_class_func' mangled-name='hb_unicode_funcs_set_combining_class_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_combining_class_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_combining_class_func_t' -->
-      <parameter type-id='type-id-90' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-91' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34052,9 +34052,9 @@
     <!-- void hb_unicode_funcs_set_eastasian_width_func(hb_unicode_funcs_t*, hb_unicode_eastasian_width_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_eastasian_width_func' mangled-name='hb_unicode_funcs_set_eastasian_width_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_eastasian_width_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_eastasian_width_func_t' -->
-      <parameter type-id='type-id-91' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-92' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34065,9 +34065,9 @@
     <!-- void hb_unicode_funcs_set_general_category_func(hb_unicode_funcs_t*, hb_unicode_general_category_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_general_category_func' mangled-name='hb_unicode_funcs_set_general_category_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_general_category_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_general_category_func_t' -->
-      <parameter type-id='type-id-92' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-93' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34078,9 +34078,9 @@
     <!-- void hb_unicode_funcs_set_mirroring_func(hb_unicode_funcs_t*, hb_unicode_mirroring_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_mirroring_func' mangled-name='hb_unicode_funcs_set_mirroring_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_mirroring_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_mirroring_func_t' -->
-      <parameter type-id='type-id-93' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-94' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34091,9 +34091,9 @@
     <!-- void hb_unicode_funcs_set_script_func(hb_unicode_funcs_t*, hb_unicode_script_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_script_func' mangled-name='hb_unicode_funcs_set_script_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_script_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_script_func_t' -->
-      <parameter type-id='type-id-94' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-95' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34104,9 +34104,9 @@
     <!-- void hb_unicode_funcs_set_compose_func(hb_unicode_funcs_t*, hb_unicode_compose_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_compose_func' mangled-name='hb_unicode_funcs_set_compose_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_compose_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_compose_func_t' -->
-      <parameter type-id='type-id-95' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-96' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34117,9 +34117,9 @@
     <!-- void hb_unicode_funcs_set_decompose_func(hb_unicode_funcs_t*, hb_unicode_decompose_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_decompose_func' mangled-name='hb_unicode_funcs_set_decompose_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_decompose_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_decompose_func_t' -->
-      <parameter type-id='type-id-96' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-97' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34130,9 +34130,9 @@
     <!-- void hb_unicode_funcs_set_decompose_compatibility_func(hb_unicode_funcs_t*, hb_unicode_decompose_compatibility_func_t, void*, hb_destroy_func_t) -->
     <function-decl name='hb_unicode_funcs_set_decompose_compatibility_func' mangled-name='hb_unicode_funcs_set_decompose_compatibility_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_decompose_compatibility_func'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_unicode_decompose_compatibility_func_t' -->
-      <parameter type-id='type-id-97' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-98' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
@@ -34143,96 +34143,96 @@
     <!-- hb_unicode_combining_class_t hb_unicode_combining_class(hb_unicode_funcs_t*, hb_codepoint_t) -->
     <function-decl name='hb_unicode_combining_class' mangled-name='hb_unicode_combining_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_combining_class'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- enum hb_unicode_combining_class_t -->
-      <return type-id='type-id-101'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <!-- unsigned int hb_unicode_eastasian_width(hb_unicode_funcs_t*, hb_codepoint_t) -->
     <function-decl name='hb_unicode_eastasian_width' mangled-name='hb_unicode_eastasian_width' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_eastasian_width'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
     <!-- hb_unicode_general_category_t hb_unicode_general_category(hb_unicode_funcs_t*, hb_codepoint_t) -->
     <function-decl name='hb_unicode_general_category' mangled-name='hb_unicode_general_category' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_general_category'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- enum hb_unicode_general_category_t -->
-      <return type-id='type-id-102'/>
+      <return type-id='type-id-103'/>
     </function-decl>
     <!-- hb_codepoint_t hb_unicode_mirroring(hb_unicode_funcs_t*, hb_codepoint_t) -->
     <function-decl name='hb_unicode_mirroring' mangled-name='hb_unicode_mirroring' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_mirroring'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- typedef hb_codepoint_t -->
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <!-- hb_script_t hb_unicode_script(hb_unicode_funcs_t*, hb_codepoint_t) -->
     <function-decl name='hb_unicode_script' mangled-name='hb_unicode_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_script'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <!-- hb_bool_t hb_unicode_decompose(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*, hb_codepoint_t*) -->
     <function-decl name='hb_unicode_decompose' mangled-name='hb_unicode_decompose' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='428' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_decompose'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='428' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='428' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='429' column='1'/>
+      <parameter type-id='type-id-69' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='429' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='430' column='1'/>
+      <parameter type-id='type-id-105' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='430' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='431' column='1'/>
+      <parameter type-id='type-id-105' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='431' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- unsigned int hb_unicode_decompose_compatibility(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t*) -->
     <function-decl name='hb_unicode_decompose_compatibility' mangled-name='hb_unicode_decompose_compatibility' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_decompose_compatibility'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='449' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='449' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='u' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='450' column='1'/>
+      <parameter type-id='type-id-69' name='u' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='450' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='decomposed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='451' column='1'/>
+      <parameter type-id='type-id-105' name='decomposed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='451' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-10'/>
     </function-decl>
     <!-- hb_bool_t hb_unicode_compose(hb_unicode_funcs_t*, hb_codepoint_t, hb_codepoint_t, hb_codepoint_t*) -->
     <function-decl name='hb_unicode_compose' mangled-name='hb_unicode_compose' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_compose'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='406' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='406' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='407' column='1'/>
+      <parameter type-id='type-id-69' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='407' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='408' column='1'/>
+      <parameter type-id='type-id-69' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='408' column='1'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='409' column='1'/>
+      <parameter type-id='type-id-105' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='409' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- void hb_unicode_funcs_make_immutable(hb_unicode_funcs_t*) -->
     <function-decl name='hb_unicode_funcs_make_immutable' mangled-name='hb_unicode_funcs_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_make_immutable'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- void* hb_unicode_funcs_get_user_data(hb_unicode_funcs_t*, hb_user_data_key_t*) -->
     <function-decl name='hb_unicode_funcs_get_user_data' mangled-name='hb_unicode_funcs_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_user_data'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='295' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='295' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='296' column='1'/>
       <!-- void* -->
@@ -34241,7 +34241,7 @@
     <!-- hb_bool_t hb_unicode_funcs_set_user_data(hb_unicode_funcs_t*, hb_user_data_key_t*, void*, hb_destroy_func_t, hb_bool_t) -->
     <function-decl name='hb_unicode_funcs_set_user_data' mangled-name='hb_unicode_funcs_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_user_data'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='274' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='274' column='1'/>
       <!-- parameter of type 'hb_user_data_key_t*' -->
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='275' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -34256,28 +34256,28 @@
     <!-- hb_unicode_funcs_t* hb_unicode_funcs_reference(hb_unicode_funcs_t*) -->
     <function-decl name='hb_unicode_funcs_reference' mangled-name='hb_unicode_funcs_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_reference'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <!-- void hb_unicode_funcs_destroy(hb_unicode_funcs_t*) -->
     <function-decl name='hb_unicode_funcs_destroy' mangled-name='hb_unicode_funcs_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_destroy'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- hb_unicode_funcs_t* hb_unicode_funcs_create(hb_unicode_funcs_t*) -->
     <function-decl name='hb_unicode_funcs_create' mangled-name='hb_unicode_funcs_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_create'>
       <!-- parameter of type 'hb_unicode_funcs_t*' -->
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <!-- hb_unicode_funcs_t* hb_unicode_funcs_get_default() -->
     <function-decl name='hb_unicode_funcs_get_default' mangled-name='hb_unicode_funcs_get_default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_default'>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
@@ -34317,7 +34317,7 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::_mtx::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='90' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='90' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- bool OT::_mtx::sanitize(OT::hb_sanitize_context_t*) -->
@@ -34361,11 +34361,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LongMetric::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::LongMetric::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- void OT::LongMetric::_instance_assertion_on_line_50() -->
@@ -34470,7 +34470,7 @@
           <!-- implicit parameter of type 'hb_ot_face_cmap_accelerator_t*' -->
           <parameter type-id='type-id-1705' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -34490,11 +34490,11 @@
           <!-- implicit parameter of type 'const hb_ot_face_cmap_accelerator_t*' -->
           <parameter type-id='type-id-1706' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -34534,7 +34534,7 @@
           <!-- implicit parameter of type 'hb_ot_face_metrics_accelerator_t*' -->
           <parameter type-id='type-id-1709' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
           <parameter type-id='type-id-180'/>
           <!-- parameter of type 'typedef hb_tag_t' -->
@@ -34560,7 +34560,7 @@
           <!-- implicit parameter of type 'const hb_ot_face_metrics_accelerator_t*' -->
           <parameter type-id='type-id-1710' is-artificial='yes'/>
           <!-- parameter of type 'typedef hb_codepoint_t' -->
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <!-- unsigned int -->
           <return type-id='type-id-10'/>
         </function-decl>
@@ -34574,14 +34574,14 @@
     <!-- LongMetric[1] -->
     <array-type-def dimensions='1' type-id='type-id-1699' size-in-bits='32' id='type-id-1695'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
 
     <!-- SHORT[1] -->
     <array-type-def dimensions='1' type-id='type-id-501' size-in-bits='16' id='type-id-1696'>
       <!-- <anonymous range>[1] -->
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <!-- OT::_mtx* -->
@@ -34599,7 +34599,7 @@
     <!-- void hb_ot_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -34617,11 +34617,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GSUB::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GSUB::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::SubstLookup& OT::GSUB::get_lookup(unsigned int) -->
@@ -34638,9 +34638,9 @@
           <!-- void OT::GSUB::substitute_start(hb_buffer_t*) -->
           <function-decl name='substitute_start' mangled-name='_ZN2OT4GSUB16substitute_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1324' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'hb_buffer_t*' -->
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-80'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34649,9 +34649,9 @@
           <!-- void OT::GSUB::substitute_finish(hb_buffer_t*) -->
           <function-decl name='substitute_finish' mangled-name='_ZN2OT4GSUB17substitute_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1325' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'hb_buffer_t*' -->
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-80'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34705,11 +34705,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GSUBGPOS::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GSUBGPOS::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- unsigned int OT::GSUBGPOS::get_script_count() -->
@@ -34938,11 +34938,11 @@
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GPOS::static_size -->
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
           <!-- static const unsigned int OT::GPOS::min_size -->
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
         </data-member>
         <member-function access='public'>
           <!-- const OT::PosLookup& OT::GPOS::get_lookup(unsigned int) -->
@@ -34959,9 +34959,9 @@
           <!-- void OT::GPOS::position_start(hb_buffer_t*) -->
           <function-decl name='position_start' mangled-name='_ZN2OT4GPOS14position_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1523' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'hb_buffer_t*' -->
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-80'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -34970,9 +34970,9 @@
           <!-- void OT::GPOS::position_finish(hb_buffer_t*) -->
           <function-decl name='position_finish' mangled-name='_ZN2OT4GPOS15position_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1524' column='1' visibility='default' binding='global' size-in-bits='64'>
             <!-- parameter of type 'hb_font_t*' -->
-            <parameter type-id='type-id-157'/>
+            <parameter type-id='type-id-158'/>
             <!-- parameter of type 'hb_buffer_t*' -->
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-80'/>
             <!-- void -->
             <return type-id='type-id-5'/>
           </function-decl>
@@ -35315,11 +35315,11 @@
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- unsigned int hb_ot_map_t::feature_map_t::index[2] -->
-            <var-decl name='index' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='47' column='1'/>
+            <var-decl name='index' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='47' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
             <!-- unsigned int hb_ot_map_t::feature_map_t::stage[2] -->
-            <var-decl name='stage' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='48' column='1'/>
+            <var-decl name='stage' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='48' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='160'>
             <!-- unsigned int hb_ot_map_t::feature_map_t::shift -->
@@ -35327,11 +35327,11 @@
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- hb_mask_t hb_ot_map_t::feature_map_t::mask -->
-            <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='50' column='1'/>
+            <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='50' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='224'>
             <!-- hb_mask_t hb_ot_map_t::feature_map_t::_1_mask -->
-            <var-decl name='_1_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='51' column='1'/>
+            <var-decl name='_1_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='51' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='31'>
             <!-- unsigned int hb_ot_map_t::feature_map_t::needs_fallback -->
@@ -35359,15 +35359,15 @@
         <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-1742'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned short int hb_ot_map_t::lookup_map_t::index -->
-            <var-decl name='index' type-id='type-id-139' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
+            <var-decl name='index' type-id='type-id-140' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='15'>
             <!-- unsigned short int hb_ot_map_t::lookup_map_t::auto_zwj -->
-            <var-decl name='auto_zwj' type-id='type-id-139' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='61' column='1'/>
+            <var-decl name='auto_zwj' type-id='type-id-140' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='61' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
             <!-- hb_mask_t hb_ot_map_t::lookup_map_t::mask -->
-            <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='62' column='1'/>
+            <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='62' column='1'/>
           </data-member>
           <member-function access='public' static='yes'>
             <!-- int hb_ot_map_t::lookup_map_t::cmp(const hb_ot_map_t::lookup_map_t*) -->
@@ -35409,7 +35409,7 @@
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
         <!-- hb_mask_t hb_ot_map_t::global_mask -->
-        <var-decl name='global_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='148' column='1'/>
+        <var-decl name='global_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <!-- hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u> hb_ot_map_t::features -->
@@ -35438,7 +35438,7 @@
           <!-- implicit parameter of type 'const hb_ot_map_t*' -->
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <!-- typedef hb_mask_t -->
-          <return type-id='type-id-86'/>
+          <return type-id='type-id-87'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -35451,7 +35451,7 @@
           <!-- parameter of type 'unsigned int*' -->
           <parameter type-id='type-id-60'/>
           <!-- typedef hb_mask_t -->
-          <return type-id='type-id-86'/>
+          <return type-id='type-id-87'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -35473,7 +35473,7 @@
           <!-- parameter of type 'typedef hb_tag_t' -->
           <parameter type-id='type-id-180'/>
           <!-- typedef hb_mask_t -->
-          <return type-id='type-id-86'/>
+          <return type-id='type-id-87'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -35540,9 +35540,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-1755'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-80'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -35555,9 +35555,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-1755'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-80'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -35577,13 +35577,13 @@
           <!-- implicit parameter of type 'hb_ot_map_t*' -->
           <parameter type-id='type-id-1752' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'typedef hb_mask_t' -->
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <!-- parameter of type 'bool' -->
           <parameter type-id='type-id-7'/>
           <!-- void -->
@@ -35600,9 +35600,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-1755'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-80'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -35617,9 +35617,9 @@
           <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-1755'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-80'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -35637,7 +35637,7 @@
     <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1760'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_segment_properties_t hb_ot_shape_plan_t::props -->
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const hb_ot_complex_shaper_t* hb_ot_shape_plan_t::shaper -->
@@ -35653,23 +35653,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
         <!-- hb_mask_t hb_ot_shape_plan_t::rtlm_mask -->
-        <var-decl name='rtlm_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='rtlm_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8608'>
         <!-- hb_mask_t hb_ot_shape_plan_t::frac_mask -->
-        <var-decl name='frac_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='frac_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8640'>
         <!-- hb_mask_t hb_ot_shape_plan_t::numr_mask -->
-        <var-decl name='numr_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='numr_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8672'>
         <!-- hb_mask_t hb_ot_shape_plan_t::dnom_mask -->
-        <var-decl name='dnom_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='dnom_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8704'>
         <!-- hb_mask_t hb_ot_shape_plan_t::kern_mask -->
-        <var-decl name='kern_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='44' column='1'/>
+        <var-decl name='kern_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
         <!-- unsigned int hb_ot_shape_plan_t::has_frac -->
@@ -35702,9 +35702,9 @@
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-1755' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-80'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -35715,9 +35715,9 @@
           <!-- implicit parameter of type 'const hb_ot_shape_plan_t*' -->
           <parameter type-id='type-id-1755' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_buffer_t*' -->
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-80'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -35890,7 +35890,7 @@
     <!-- feature_map_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-1740' size-in-bits='2304' id='type-id-1766'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::feature_map_t, 8u>* -->
@@ -36073,7 +36073,7 @@
       </member-type>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int GSUBProxy::table_index -->
-        <var-decl name='table_index' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='805' column='1'/>
+        <var-decl name='table_index' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='805' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const bool GSUBProxy::inplace -->
@@ -36093,7 +36093,7 @@
           <!-- implicit parameter of type 'GSUBProxy*' -->
           <parameter type-id='type-id-1787' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -36187,7 +36187,7 @@
       </member-type>
       <data-member access='public' static='yes'>
         <!-- static const unsigned int GPOSProxy::table_index -->
-        <var-decl name='table_index' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='819' column='1'/>
+        <var-decl name='table_index' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='819' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <!-- static const bool GPOSProxy::inplace -->
@@ -36207,7 +36207,7 @@
           <!-- implicit parameter of type 'GPOSProxy*' -->
           <parameter type-id='type-id-1797' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- void -->
           <return type-id='type-id-5'/>
         </function-decl>
@@ -36231,7 +36231,7 @@
     <!-- stage_map_t[4] -->
     <array-type-def dimensions='1' type-id='type-id-1744' size-in-bits='512' id='type-id-1734'>
       <!-- <anonymous range>[4] -->
-      <subrange length='4' type-id='type-id-42' id='type-id-145'/>
+      <subrange length='4' type-id='type-id-42' id='type-id-146'/>
 
     </array-type-def>
     <!-- hb_prealloced_array_t<hb_ot_map_t::stage_map_t, 4u>* -->
@@ -36253,7 +36253,7 @@
     <!-- unsigned int hb_ot_layout_table_get_lookup_count(hb_face_t*, hb_tag_t) -->
     <function-decl name='hb_ot_layout_table_get_lookup_count' mangled-name='hb_ot_layout_table_get_lookup_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_lookup_count'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='438' column='1'/>
       <!-- unsigned int -->
@@ -36262,21 +36262,21 @@
     <!-- hb_bool_t hb_ot_layout_has_positioning(hb_face_t*) -->
     <function-decl name='hb_ot_layout_has_positioning' mangled-name='hb_ot_layout_has_positioning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_positioning'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_has_substitution(hb_face_t*) -->
     <function-decl name='hb_ot_layout_has_substitution' mangled-name='hb_ot_layout_has_substitution' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_substitution'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- unsigned int hb_ot_layout_feature_get_lookups(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_feature_get_lookups' mangled-name='hb_ot_layout_feature_get_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_feature_get_lookups'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='424' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36293,7 +36293,7 @@
     <!-- unsigned int hb_ot_layout_script_get_language_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_script_get_language_tags' mangled-name='hb_ot_layout_script_get_language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_get_language_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='291' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36310,7 +36310,7 @@
     <!-- unsigned int hb_ot_layout_table_get_feature_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_table_get_feature_tags' mangled-name='hb_ot_layout_table_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_feature_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36325,7 +36325,7 @@
     <!-- unsigned int hb_ot_layout_table_get_script_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_table_get_script_tags' mangled-name='hb_ot_layout_table_get_script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_script_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36340,14 +36340,14 @@
     <!-- hb_bool_t hb_ot_layout_has_glyph_classes(hb_face_t*) -->
     <function-decl name='hb_ot_layout_has_glyph_classes' mangled-name='hb_ot_layout_has_glyph_classes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_glyph_classes'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <!-- typedef hb_bool_t -->
       <return type-id='type-id-26'/>
     </function-decl>
     <!-- hb_bool_t hb_ot_layout_get_size_params(hb_face_t*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_get_size_params' mangled-name='hb_ot_layout_get_size_params' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_size_params'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
       <parameter type-id='type-id-60' name='design_size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='753' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -36364,7 +36364,7 @@
     <!-- hb_bool_t hb_ot_layout_language_find_feature(hb_face_t*, hb_tag_t, unsigned int, unsigned int, hb_tag_t, unsigned int*) -->
     <function-decl name='hb_ot_layout_language_find_feature' mangled-name='hb_ot_layout_language_find_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_find_feature'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='398' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36381,7 +36381,7 @@
     <!-- unsigned int hb_ot_layout_language_get_feature_tags(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_language_get_feature_tags' mangled-name='hb_ot_layout_language_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_tags'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='373' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36400,7 +36400,7 @@
     <!-- unsigned int hb_ot_layout_language_get_feature_indexes(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_language_get_feature_indexes' mangled-name='hb_ot_layout_language_get_feature_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_indexes'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='358' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36419,7 +36419,7 @@
     <!-- hb_bool_t hb_ot_layout_language_get_required_feature(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_language_get_required_feature' mangled-name='hb_ot_layout_language_get_required_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='340' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36436,7 +36436,7 @@
     <!-- hb_bool_t hb_ot_layout_language_get_required_feature_index(hb_face_t*, hb_tag_t, unsigned int, unsigned int, unsigned int*) -->
     <function-decl name='hb_ot_layout_language_get_required_feature_index' mangled-name='hb_ot_layout_language_get_required_feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature_index'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='325' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36451,7 +36451,7 @@
     <!-- hb_bool_t hb_ot_layout_script_find_language(hb_face_t*, hb_tag_t, unsigned int, hb_tag_t, unsigned int*) -->
     <function-decl name='hb_ot_layout_script_find_language' mangled-name='hb_ot_layout_script_find_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_find_language'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='304' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -36466,11 +36466,11 @@
     <!-- hb_bool_t hb_ot_layout_lookup_would_substitute(hb_face_t*, unsigned int, const hb_codepoint_t*, unsigned int, hb_bool_t) -->
     <function-decl name='hb_ot_layout_lookup_would_substitute' mangled-name='hb_ot_layout_lookup_would_substitute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_would_substitute'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='681' column='1'/>
       <!-- parameter of type 'const hb_codepoint_t*' -->
-      <parameter type-id='type-id-85' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='682' column='1'/>
+      <parameter type-id='type-id-86' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='682' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='glyphs_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='683' column='1'/>
       <!-- parameter of type 'typedef hb_bool_t' -->
@@ -36481,9 +36481,9 @@
     <!-- unsigned int hb_ot_layout_get_attach_points(hb_face_t*, hb_codepoint_t, unsigned int, unsigned int*, unsigned int*) -->
     <function-decl name='hb_ot_layout_get_attach_points' mangled-name='hb_ot_layout_get_attach_points' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_attach_points'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='148' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='148' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='149' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -36498,7 +36498,7 @@
     <!-- hb_bool_t hb_ot_layout_table_choose_script(hb_face_t*, hb_tag_t, const hb_tag_t*, unsigned int*, hb_tag_t*) -->
     <function-decl name='hb_ot_layout_table_choose_script' mangled-name='hb_ot_layout_table_choose_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_choose_script'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
@@ -36513,11 +36513,11 @@
     <!-- unsigned int hb_ot_layout_get_ligature_carets(hb_font_t*, hb_direction_t, hb_codepoint_t, unsigned int, unsigned int*, int*) -->
     <function-decl name='hb_ot_layout_get_ligature_carets' mangled-name='hb_ot_layout_get_ligature_carets' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_ligature_carets'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
       <!-- parameter of type 'enum hb_direction_t' -->
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='159' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='159' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='160' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
@@ -36539,7 +36539,7 @@
     <!-- void hb_ot_layout_get_glyphs_in_class(hb_face_t*, hb_ot_layout_glyph_class_t, hb_set_t*) -->
     <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 of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' 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-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='139' column='1'/>
       <!-- parameter of type 'enum hb_ot_layout_glyph_class_t' -->
       <parameter type-id='type-id-1804' 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*' -->
@@ -36550,7 +36550,7 @@
     <!-- hb_bool_t hb_ot_layout_table_find_script(hb_face_t*, hb_tag_t, hb_tag_t, unsigned int*) -->
     <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'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='200' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
@@ -36563,7 +36563,7 @@
     <!-- void hb_ot_layout_collect_lookups(hb_face_t*, hb_tag_t, const hb_tag_t*, const hb_tag_t*, const hb_tag_t*, hb_set_t*) -->
     <function-decl name='hb_ot_layout_collect_lookups' mangled-name='hb_ot_layout_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_collect_lookups'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
       <!-- parameter of type 'const hb_tag_t*' -->
@@ -36580,7 +36580,7 @@
     <!-- void hb_ot_layout_lookup_collect_glyphs(hb_face_t*, hb_tag_t, unsigned int, hb_set_t*, hb_set_t*, hb_set_t*, hb_set_t*) -->
     <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 of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' 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-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='635' column='1'/>
       <!-- parameter of type 'typedef hb_tag_t' -->
       <parameter type-id='type-id-180' 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 of type 'unsigned int' -->
@@ -36599,7 +36599,7 @@
     <!-- void hb_ot_layout_lookup_substitute_closure(hb_face_t*, unsigned int, hb_set_t*) -->
     <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 of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' 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-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='718' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-10' 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*' -->
@@ -36610,9 +36610,9 @@
     <!-- hb_ot_layout_glyph_class_t hb_ot_layout_get_glyph_class(hb_face_t*, hb_codepoint_t) -->
     <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'>
       <!-- parameter of type 'hb_face_t*' -->
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='133' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='133' column='1'/>
       <!-- enum hb_ot_layout_glyph_class_t -->
       <return type-id='type-id-1804'/>
     </function-decl>
@@ -36625,9 +36625,9 @@
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
       <parameter type-id='type-id-1755'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-80'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-type>
@@ -36695,7 +36695,7 @@
     <!-- char[8] -->
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='64' id='type-id-1808'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <!-- enum hb_ot_shape_normalization_mode_t -->
@@ -36727,11 +36727,11 @@
       <!-- parameter of type 'const hb_ot_shape_normalize_context_t*' -->
       <parameter type-id='type-id-1821'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- bool -->
       <return type-id='type-id-7'/>
     </function-type>
@@ -36740,11 +36740,11 @@
       <!-- parameter of type 'const hb_ot_shape_normalize_context_t*' -->
       <parameter type-id='type-id-1821'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'typedef hb_codepoint_t' -->
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <!-- parameter of type 'hb_codepoint_t*' -->
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <!-- bool -->
       <return type-id='type-id-7'/>
     </function-type>
@@ -36753,9 +36753,9 @@
       <!-- parameter of type 'const hb_ot_shape_plan_t*' -->
       <parameter type-id='type-id-1755'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-80'/>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-type>
@@ -36783,11 +36783,11 @@
     <class-decl name='hb_ot_shape_planner_t' size-in-bits='10624' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='66' column='1' id='type-id-1824'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_face_t* hb_ot_shape_planner_t::face -->
-        <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
+        <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_segment_properties_t hb_ot_shape_planner_t::props -->
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='69' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const hb_ot_complex_shaper_t* hb_ot_shape_planner_t::shaper -->
@@ -36886,7 +36886,7 @@
           </data-member>
           <data-member access='public' layout-offset-in-bits='160'>
             <!-- unsigned int hb_ot_map_builder_t::feature_info_t::stage[2] -->
-            <var-decl name='stage' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='216' column='1'/>
+            <var-decl name='stage' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='216' column='1'/>
           </data-member>
           <member-function access='public' static='yes'>
             <!-- int hb_ot_map_builder_t::feature_info_t::cmp(const hb_ot_map_builder_t::feature_info_t*) -->
@@ -36916,11 +36916,11 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_face_t* hb_ot_map_builder_t::face -->
-        <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
+        <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_segment_properties_t hb_ot_map_builder_t::props -->
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='232' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- hb_tag_t hb_ot_map_builder_t::chosen_script[2] -->
@@ -36932,15 +36932,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
         <!-- unsigned int hb_ot_map_builder_t::script_index[2] -->
-        <var-decl name='script_index' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
+        <var-decl name='script_index' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
         <!-- unsigned int hb_ot_map_builder_t::language_index[2] -->
-        <var-decl name='language_index' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
+        <var-decl name='language_index' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
         <!-- unsigned int hb_ot_map_builder_t::current_stage[2] -->
-        <var-decl name='current_stage' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='240' column='1'/>
+        <var-decl name='current_stage' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <!-- hb_prealloced_array_t<hb_ot_map_builder_t::feature_info_t, 32u> hb_ot_map_builder_t::feature_infos -->
@@ -36956,7 +36956,7 @@
           <!-- implicit parameter of type 'hb_ot_map_builder_t*' -->
           <parameter type-id='type-id-1837' is-artificial='yes'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- parameter of type 'const hb_segment_properties_t*' -->
           <parameter type-id='type-id-241'/>
           <!-- void -->
@@ -37053,15 +37053,15 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_buffer_t* hb_ot_shape_normalize_context_t::buffer -->
-        <var-decl name='buffer' type-id='type-id-79' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
+        <var-decl name='buffer' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- hb_font_t* hb_ot_shape_normalize_context_t::font -->
-        <var-decl name='font' type-id='type-id-157' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
+        <var-decl name='font' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- hb_unicode_funcs_t* hb_ot_shape_normalize_context_t::unicode -->
-        <var-decl name='unicode' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
+        <var-decl name='unicode' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- bool ()* hb_ot_shape_normalize_context_t::decompose -->
@@ -37369,7 +37369,7 @@
     <!-- stage_info_t[8] -->
     <array-type-def dimensions='1' type-id='type-id-1834' size-in-bits='1024' id='type-id-1849'>
       <!-- <anonymous range>[8] -->
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <!-- const hb_ot_map_builder_t::stage_info_t -->
@@ -37400,9 +37400,9 @@
     <!-- void hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const hb_feature_t*, unsigned int, hb_set_t*) -->
     <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'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
       <!-- parameter of type 'hb_buffer_t*' -->
-      <parameter type-id='type-id-79' 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-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='771' column='1'/>
       <!-- parameter of type 'const hb_feature_t*' -->
       <parameter type-id='type-id-229' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='772' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -37439,7 +37439,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- hb_codepoint_t indic_shape_plan_t::virama_glyph -->
-        <var-decl name='virama_glyph' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='532' column='1'/>
+        <var-decl name='virama_glyph' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='532' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- would_substitute_feature_t indic_shape_plan_t::rphf -->
@@ -37476,9 +37476,9 @@
           <!-- implicit parameter of type 'const indic_shape_plan_t*' -->
           <parameter type-id='type-id-1860' is-artificial='yes'/>
           <!-- parameter of type 'hb_font_t*' -->
-          <parameter type-id='type-id-157'/>
+          <parameter type-id='type-id-158'/>
           <!-- parameter of type 'hb_codepoint_t*' -->
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -37488,7 +37488,7 @@
     <class-decl name='indic_config_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-shape-complex-indic.cc' line='305' column='1' id='type-id-1861'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- hb_script_t indic_config_t::script -->
-        <var-decl name='script' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='306' column='1'/>
+        <var-decl name='script' type-id='type-id-104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- bool indic_config_t::has_old_spec -->
@@ -37496,7 +37496,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- hb_codepoint_t indic_config_t::virama -->
-        <var-decl name='virama' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='308' column='1'/>
+        <var-decl name='virama' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- base_position_t indic_config_t::base_pos -->
@@ -37596,11 +37596,11 @@
           <!-- implicit parameter of type 'const would_substitute_feature_t*' -->
           <parameter type-id='type-id-1869' is-artificial='yes'/>
           <!-- parameter of type 'const hb_codepoint_t*' -->
-          <parameter type-id='type-id-85'/>
+          <parameter type-id='type-id-86'/>
           <!-- parameter of type 'unsigned int' -->
           <parameter type-id='type-id-10'/>
           <!-- parameter of type 'hb_face_t*' -->
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <!-- bool -->
           <return type-id='type-id-7'/>
         </function-decl>
@@ -37614,7 +37614,7 @@
     <pointer-type-def type-id='type-id-1870' size-in-bits='64' id='type-id-1869'/>
 
     <!-- hb_mask_t[21] -->
-    <array-type-def dimensions='1' type-id='type-id-86' size-in-bits='672' id='type-id-1859'>
+    <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='672' id='type-id-1859'>
       <!-- <anonymous range>[21] -->
       <subrange length='21' type-id='type-id-42' id='type-id-1871'/>
 
@@ -37649,7 +37649,7 @@
     <!-- hb_unicode_funcs_t* hb_glib_get_unicode_funcs() -->
     <function-decl name='hb_glib_get_unicode_funcs' mangled-name='hb_glib_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_get_unicode_funcs'>
       <!-- hb_unicode_funcs_t* -->
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <!-- enum GUnicodeScript -->
     <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-1873'>
@@ -37785,7 +37785,7 @@
     <!-- GUnicodeScript hb_glib_script_from_script(hb_script_t) -->
     <function-decl name='hb_glib_script_from_script' mangled-name='hb_glib_script_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_script_from_script'>
       <!-- parameter of type 'enum hb_script_t' -->
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1'/>
       <!-- enum GUnicodeScript -->
       <return type-id='type-id-1873'/>
     </function-decl>
@@ -37794,7 +37794,7 @@
       <!-- parameter of type 'enum GUnicodeScript' -->
       <parameter type-id='type-id-1873' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1'/>
       <!-- enum hb_script_t -->
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
@@ -37957,7 +37957,7 @@
       </data-member>
     </class-decl>
     <!-- typedef short int FT_Short -->
-    <typedef-decl name='FT_Short' type-id='type-id-141' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-1883'/>
+    <typedef-decl name='FT_Short' type-id='type-id-142' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-1883'/>
     <!-- typedef long int FT_Pos -->
     <typedef-decl name='FT_Pos' type-id='type-id-39' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-1894'/>
     <!-- typedef FT_Bitmap_Size_ FT_Bitmap_Size -->
@@ -38013,7 +38013,7 @@
     <!-- typedef FT_Encoding_ FT_Encoding -->
     <typedef-decl name='FT_Encoding' type-id='type-id-1900' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='727' column='1' id='type-id-1898'/>
     <!-- typedef unsigned short int FT_UShort -->
-    <typedef-decl name='FT_UShort' type-id='type-id-139' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-1882'/>
+    <typedef-decl name='FT_UShort' type-id='type-id-140' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-1882'/>
     <!-- FT_CharMapRec_* -->
     <pointer-type-def type-id='type-id-1896' size-in-bits='64' id='type-id-1901'/>
     <!-- typedef FT_CharMapRec_* FT_CharMap -->
@@ -38242,7 +38242,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- short int FT_Bitmap_::num_grays -->
-        <var-decl name='num_grays' type-id='type-id-141' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='325' column='1'/>
+        <var-decl name='num_grays' type-id='type-id-142' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='208'>
         <!-- char FT_Bitmap_::pixel_mode -->
@@ -38258,18 +38258,18 @@
       </data-member>
     </class-decl>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-1923'/>
+    <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-1923'/>
     <!-- typedef FT_Bitmap_ FT_Bitmap -->
     <typedef-decl name='FT_Bitmap' type-id='type-id-1922' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='330' column='1' id='type-id-1912'/>
     <!-- struct FT_Outline_ -->
     <class-decl name='FT_Outline_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='393' column='1' id='type-id-1924'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- short int FT_Outline_::n_contours -->
-        <var-decl name='n_contours' type-id='type-id-141' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='394' column='1'/>
+        <var-decl name='n_contours' type-id='type-id-142' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
         <!-- short int FT_Outline_::n_points -->
-        <var-decl name='n_points' type-id='type-id-141' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='395' column='1'/>
+        <var-decl name='n_points' type-id='type-id-142' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- FT_Vector* FT_Outline_::points -->
@@ -38291,7 +38291,7 @@
     <!-- FT_Vector* -->
     <pointer-type-def type-id='type-id-1910' size-in-bits='64' id='type-id-1925'/>
     <!-- short int* -->
-    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-1926'/>
+    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-1926'/>
     <!-- typedef FT_Outline_ FT_Outline -->
     <typedef-decl name='FT_Outline' type-id='type-id-1924' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-1913'/>
     <!-- struct FT_SubGlyphRec_ -->
@@ -38522,14 +38522,14 @@
     <!-- FT_Face hb_ft_font_get_face(hb_font_t*) -->
     <function-decl name='hb_ft_font_get_face' mangled-name='hb_ft_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_get_face'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
       <!-- typedef FT_Face -->
       <return type-id='type-id-1897'/>
     </function-decl>
     <!-- void hb_ft_font_set_funcs(hb_font_t*) -->
     <function-decl name='hb_ft_font_set_funcs' mangled-name='hb_ft_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_set_funcs'>
       <!-- parameter of type 'hb_font_t*' -->
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <!-- void -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -38540,7 +38540,7 @@
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='334' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- hb_font_t* hb_ft_font_create(FT_Face, hb_destroy_func_t) -->
     <function-decl name='hb_ft_font_create' mangled-name='hb_ft_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_create'>
@@ -38549,14 +38549,14 @@
       <!-- parameter of type 'typedef hb_destroy_func_t' -->
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
       <!-- hb_font_t* -->
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <!-- hb_face_t* hb_ft_face_create_cached(FT_Face) -->
     <function-decl name='hb_ft_face_create_cached' mangled-name='hb_ft_face_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create_cached'>
       <!-- parameter of type 'typedef FT_Face' -->
       <parameter type-id='type-id-1897' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1'/>
       <!-- hb_face_t* -->
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <!-- unsigned long int (FT_Stream, unsigned long int, unsigned char*, unsigned long int) -->
     <function-type size-in-bits='64' id='type-id-1957'>

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 30b3feb..1e67475 100644 (file)
--- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
+++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi
@@ -9900,7 +9900,7 @@
         <var-decl name='kValueMask' type-id='type-id-65' visibility='default' filepath='src/packed-cache-inl.h' line='230' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
-        <!-- unsigned long int[65536] volatile PackedCache<35, long unsigned int>::array_ -->
+        <!-- volatile unsigned long int PackedCache<35, long unsigned int>::array_[65536] -->
         <var-decl name='array_' type-id='type-id-304' visibility='default' filepath='src/packed-cache-inl.h' line='234' column='1'/>
       </data-member>
       <member-function access='private'>
@@ -10006,14 +10006,14 @@
     <!-- const uintptr_t -->
     <qualified-type-def type-id='type-id-192' const='yes' id='type-id-303'/>
 
-    <!-- unsigned long int[65536] -->
-    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='4194304' id='type-id-307'>
+    <!-- volatile unsigned long int[65536] -->
+    <array-type-def dimensions='1' type-id='type-id-307' size-in-bits='4194304' id='type-id-304'>
       <!-- <anonymous range>[65536] -->
       <subrange length='65536' type-id='type-id-17' id='type-id-308'/>
 
     </array-type-def>
-    <!-- unsigned long int[65536] volatile -->
-    <qualified-type-def type-id='type-id-307' volatile='yes' id='type-id-304'/>
+    <!-- volatile unsigned long int -->
+    <qualified-type-def type-id='type-id-17' volatile='yes' id='type-id-307'/>
     <!-- PackedCache<35, long unsigned int>* -->
     <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-305'/>
     <!-- const PackedCache<35, long unsigned int> -->

diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi
index 797cc34..e66a395 100644 (file)
--- a/tests/data/test-annotate/test21-pr19092.so.abi
+++ b/tests/data/test-annotate/test21-pr19092.so.abi
@@ -2504,6 +2504,10 @@
       <!-- char* -->
       <return type-id='type-id-9'/>
     </function-decl>
+    <!-- const char -->
+    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-144'/>
+    <!-- const unsigned char -->
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-145'/>
     <!-- enum node_type -->
     <enum-decl name='node_type' filepath='../.././libcpp/include/cpplib.h' line='614' column='1' id='type-id-137'>
       <underlying-type type-id='type-id-92'/>
@@ -2620,7 +2624,7 @@
     <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-136'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* ht_identifier::str -->
-        <var-decl name='str' type-id='type-id-144' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
+        <var-decl name='str' type-id='type-id-146' 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 -->
@@ -2635,15 +2639,15 @@
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-138'>
       <data-member access='private'>
         <!-- cpp_macro* _cpp_hashnode_value::macro -->
-        <var-decl name='macro' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- answer* _cpp_hashnode_value::answers -->
-        <var-decl name='answers' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- cpp_builtin_type _cpp_hashnode_value::builtin -->
-        <var-decl name='builtin' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- unsigned short int _cpp_hashnode_value::arg_index -->
@@ -2651,13 +2655,13 @@
       </data-member>
     </union-decl>
     <!-- answer* -->
-    <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-146'/>
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-148'/>
     <!-- const unsigned char* -->
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-146'/>
     <!-- cpp_macro* -->
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-145'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-147'/>
     <!-- enum cpp_builtin_type -->
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-147'>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-149'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -2673,12 +2677,12 @@
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
     <!-- const unsigned char -->
-    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-149'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-151'/>
     <!-- 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-148'>
+    <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-150'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- answer* answer::next -->
-        <var-decl name='next' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int answer::count -->
@@ -2686,39 +2690,39 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token answer::first[1] -->
-        <var-decl name='first' type-id='type-id-151' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-153' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_macro cpp_macro -->
-    <typedef-decl name='cpp_macro' type-id='type-id-152' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-150'/>
+    <typedef-decl name='cpp_macro' type-id='type-id-154' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-152'/>
     <!-- cpp_token[1] -->
-    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='192' id='type-id-151'>
+    <array-type-def dimensions='1' type-id='type-id-155' size-in-bits='192' id='type-id-153'>
       <!-- <anonymous range>[1] -->
       <subrange length='1' type-id='type-id-22' id='type-id-23'/>
 
     </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-152'>
+    <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-154'>
       <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-154'>
+        <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-156'>
           <data-member access='private'>
             <!-- cpp_token* cpp_macro::cpp_macro_u::tokens -->
-            <var-decl name='tokens' type-id='type-id-155' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-157' 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 -->
-            <var-decl name='text' type-id='type-id-144' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
+            <var-decl name='text' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode** cpp_macro::params -->
-        <var-decl name='params' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-158' 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-154' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-156' 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 -->
@@ -2758,29 +2762,29 @@
       </data-member>
     </class-decl>
     <!-- cpp_hashnode** -->
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-158'/>
     <!-- cpp_token* -->
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-157'/>
     <!-- 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-153'>
+    <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-155'>
       <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-157'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-159'>
           <data-member access='private'>
             <!-- cpp_identifier cpp_token::cpp_token_u::node -->
-            <var-decl name='node' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-160' 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-155' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-157' 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-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-161' 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-160' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-162' 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 -->
@@ -2798,7 +2802,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
         <!-- cpp_ttype cpp_token::type -->
-        <var-decl name='type' type-id='type-id-161' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-163' 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 -->
@@ -2806,11 +2810,11 @@
       </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-157' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' 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-161'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-163'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -2901,28 +2905,28 @@
       <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-158'>
+    <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-160'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* cpp_identifier::node -->
         <var-decl name='node' type-id='type-id-133' 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-160'>
+    <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-162'>
       <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-35' 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-159'>
+    <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-161'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned int cpp_string::len -->
         <var-decl name='len' type-id='type-id-35' 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-144' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
+        <var-decl name='text' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
       </data-member>
     </class-decl>
   </abi-instr>
@@ -2952,25 +2956,25 @@
     <!-- obstack symbol_stack_obstack -->
     <var-decl name='symbol_stack_obstack' type-id='type-id-31' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
     <!-- struct symbol_stack_entry -->
-    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-162'>
+    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-164'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- symbol* symbol_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-163' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-165' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- symbol_stack_entry* symbol_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-164' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-166' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct symbol_hash_entry -->
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-165'>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-167'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* symbol_hash_entry::key -->
         <var-decl name='key' type-id='type-id-8' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_hash_entry* symbol_hash_entry::file -->
-        <var-decl name='file' type-id='type-id-166' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-168' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int symbol_hash_entry::chosen -->
@@ -2986,7 +2990,7 @@
       </data-member>
     </class-decl>
     <!-- struct file_hash_entry -->
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-167'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-169'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file_hash_entry::key -->
         <var-decl name='key' type-id='type-id-8' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
@@ -3009,58 +3013,58 @@
       </data-member>
     </class-decl>
     <!-- file_hash_entry* -->
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-166'/>
+    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-168'/>
     <!-- typedef symbol_hash_entry symbol -->
-    <typedef-decl name='symbol' type-id='type-id-165' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-168'/>
+    <typedef-decl name='symbol' type-id='type-id-167' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-170'/>
     <!-- symbol* -->
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-163'/>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-165'/>
     <!-- symbol_stack_entry* -->
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-166'/>
     <!-- symbol_stack_entry* symbol_stack -->
-    <var-decl name='symbol_stack' type-id='type-id-164' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <var-decl name='symbol_stack' type-id='type-id-166' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <!-- obstack file_stack_obstack -->
     <var-decl name='file_stack_obstack' type-id='type-id-31' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
     <!-- struct file_stack_entry -->
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-169'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-171'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- file* file_stack_entry::value -->
-        <var-decl name='value' type-id='type-id-170' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-172' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- file_stack_entry* file_stack_entry::next -->
-        <var-decl name='next' type-id='type-id-171' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-173' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef file_hash_entry file -->
-    <typedef-decl name='file' type-id='type-id-167' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-172'/>
+    <typedef-decl name='file' type-id='type-id-169' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-174'/>
     <!-- file* -->
-    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-172'/>
     <!-- file_stack_entry* -->
-    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-171'/>
+    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-173'/>
     <!-- file_stack_entry* file_stack -->
-    <var-decl name='file_stack' type-id='type-id-171' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <var-decl name='file_stack' type-id='type-id-173' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
     <!-- typedef unsigned int hashval_t -->
-    <typedef-decl name='hashval_t' type-id='type-id-35' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-173'/>
+    <typedef-decl name='hashval_t' type-id='type-id-35' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-175'/>
     <!-- hashval_t htab_hash_string(void*) -->
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-175'/>
     </function-decl>
     <!-- struct htab -->
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/hashtab.h' line='100' column='1' id='type-id-174'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/hashtab.h' line='100' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- htab_hash htab::hash_f -->
-        <var-decl name='hash_f' type-id='type-id-175' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-177' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- htab_eq htab::eq_f -->
-        <var-decl name='eq_f' type-id='type-id-176' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-178' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- htab_del htab::del_f -->
-        <var-decl name='del_f' type-id='type-id-177' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-179' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- void** htab::entries -->
@@ -3088,11 +3092,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- htab_alloc htab::alloc_f -->
-        <var-decl name='alloc_f' type-id='type-id-178' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-180' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- htab_free htab::free_f -->
-        <var-decl name='free_f' type-id='type-id-179' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-181' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- void* htab::alloc_arg -->
@@ -3100,11 +3104,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
         <!-- htab_alloc_with_arg htab::alloc_with_arg_f -->
-        <var-decl name='alloc_with_arg_f' type-id='type-id-180' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-182' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
         <!-- htab_free_with_arg htab::free_with_arg_f -->
-        <var-decl name='free_with_arg_f' type-id='type-id-181' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-183' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- unsigned int htab::size_prime_index -->
@@ -3112,35 +3116,35 @@
       </data-member>
     </class-decl>
     <!-- typedef hashval_t (void*)* -->
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
     <!-- typedef typedef hashval_t (void*)* htab_hash -->
-    <typedef-decl name='htab_hash' type-id='type-id-183' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-175'/>
+    <typedef-decl name='htab_hash' type-id='type-id-185' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-177'/>
     <!-- int (void*, void*)* -->
-    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
+    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-187'/>
     <!-- typedef int (void*, void*)* htab_eq -->
-    <typedef-decl name='htab_eq' type-id='type-id-185' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-176'/>
+    <typedef-decl name='htab_eq' type-id='type-id-187' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-178'/>
     <!-- typedef void (void*)* htab_del -->
-    <typedef-decl name='htab_del' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-177'/>
+    <typedef-decl name='htab_del' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-179'/>
     <!-- void* (typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-187'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
     <!-- typedef void* (typedef size_t, typedef size_t)* htab_alloc -->
-    <typedef-decl name='htab_alloc' type-id='type-id-187' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-178'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-189' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-180'/>
     <!-- typedef void (void*)* htab_free -->
-    <typedef-decl name='htab_free' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-179'/>
+    <typedef-decl name='htab_free' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-181'/>
     <!-- void* (void*, typedef size_t, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
+    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
     <!-- typedef void* (void*, typedef size_t, typedef size_t)* htab_alloc_with_arg -->
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-189' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-180'/>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-191' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-182'/>
     <!-- void (void*, void*)* -->
-    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
     <!-- typedef void (void*, void*)* htab_free_with_arg -->
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-191' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-181'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-193' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-183'/>
     <!-- htab* -->
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-192'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-194'/>
     <!-- typedef htab* htab_t -->
-    <typedef-decl name='htab_t' type-id='type-id-192' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-193'/>
+    <typedef-decl name='htab_t' type-id='type-id-194' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-195'/>
     <!-- enum insert_option -->
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-194'>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-196'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
@@ -3148,13 +3152,13 @@
     <!-- void** htab_find_slot_with_hash(htab_t, void*, hashval_t, insert_option) -->
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-175'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-194'/>
+      <parameter type-id='type-id-196'/>
       <!-- void** -->
       <return type-id='type-id-102'/>
     </function-decl>
@@ -3203,13 +3207,13 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-177'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-176'/>
+      <parameter type-id='type-id-178'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-177'/>
+      <parameter type-id='type-id-179'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-193'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- char* getpwd() -->
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3235,7 +3239,7 @@
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- int (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-184'>
+    <function-type size-in-bits='64' id='type-id-186'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'void*' -->
@@ -3244,14 +3248,14 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- hashval_t (void*) -->
-    <function-type size-in-bits='64' id='type-id-182'>
+    <function-type size-in-bits='64' id='type-id-184'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-175'/>
     </function-type>
     <!-- void (void*, void*) -->
-    <function-type size-in-bits='64' id='type-id-190'>
+    <function-type size-in-bits='64' id='type-id-192'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'void*' -->
@@ -3260,7 +3264,7 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void* (size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-186'>
+    <function-type size-in-bits='64' id='type-id-188'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -3269,7 +3273,7 @@
       <return type-id='type-id-2'/>
     </function-type>
     <!-- void* (void*, size_t, size_t) -->
-    <function-type size-in-bits='64' id='type-id-188'>
+    <function-type size-in-bits='64' id='type-id-190'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -3462,7 +3466,7 @@
   <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.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'>
 
     <!-- enum gt_types_enum -->
-    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-195'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-197'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -4143,7 +4147,7 @@
     <!-- void* ggc_alloc_typed_stat(gt_types_enum, size_t) -->
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
       <!-- parameter of type 'enum gt_types_enum' -->
-      <parameter type-id='type-id-195' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-197' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <!-- void* -->
@@ -4164,18 +4168,18 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- struct alloc_zone -->
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-196'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int alloc_zone::dummy -->
         <var-decl name='dummy' type-id='type-id-3' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-decl>
     <!-- alloc_zone rtl_zone -->
-    <var-decl name='rtl_zone' type-id='type-id-196' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-198' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
     <!-- alloc_zone tree_zone -->
-    <var-decl name='tree_zone' type-id='type-id-196' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-198' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
     <!-- alloc_zone tree_id_zone -->
-    <var-decl name='tree_id_zone' type-id='type-id-196' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-198' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
 
@@ -4502,14 +4506,14 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- struct line_maps -->
-    <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-197'>
+    <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-199'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- maps_info line_maps::info_ordinary -->
-        <var-decl name='info_ordinary' type-id='type-id-198' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
+        <var-decl name='info_ordinary' type-id='type-id-200' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- maps_info line_maps::info_macro -->
-        <var-decl name='info_macro' type-id='type-id-198' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
+        <var-decl name='info_macro' type-id='type-id-200' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int line_maps::depth -->
@@ -4533,18 +4537,18 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- line_map_realloc line_maps::reallocator -->
-        <var-decl name='reallocator' type-id='type-id-199' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
+        <var-decl name='reallocator' type-id='type-id-201' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- line_map_round_alloc_size_func line_maps::round_alloc_size -->
-        <var-decl name='round_alloc_size' type-id='type-id-200' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
+        <var-decl name='round_alloc_size' type-id='type-id-202' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct maps_info -->
-    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-198'>
+    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- line_map* maps_info::maps -->
-        <var-decl name='maps' type-id='type-id-201' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
+        <var-decl name='maps' type-id='type-id-203' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int maps_info::allocated -->
@@ -4560,36 +4564,36 @@
       </data-member>
     </class-decl>
     <!-- line_map* -->
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-203'/>
     <!-- void* (void*, typedef size_t)* -->
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
     <!-- typedef void* (void*, typedef size_t)* line_map_realloc -->
-    <typedef-decl name='line_map_realloc' type-id='type-id-203' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-199'/>
+    <typedef-decl name='line_map_realloc' type-id='type-id-205' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-201'/>
     <!-- typedef size_t (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
     <!-- typedef typedef size_t (typedef size_t)* line_map_round_alloc_size_func -->
-    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-205' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-200'/>
+    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-207' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-202'/>
     <!-- line_maps* -->
-    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-206'/>
+    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-208'/>
     <!-- enum location_resolution_kind -->
-    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-207'>
+    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-209'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='LRK_MACRO_EXPANSION_POINT' value='0'/>
       <enumerator name='LRK_SPELLING_LOCATION' value='1'/>
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
     <!-- const line_map** -->
-    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-210'/>
     <!-- source_location linemap_resolve_location(line_maps*, source_location, location_resolution_kind, const line_map**) -->
     <function-decl name='linemap_resolve_location' mangled-name='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map' filepath='../.././gcc/../libcpp/include/line-map.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- parameter of type 'enum location_resolution_kind' -->
-      <parameter type-id='type-id-207'/>
+      <parameter type-id='type-id-209'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-210'/>
       <!-- typedef source_location -->
       <return type-id='type-id-106'/>
     </function-decl>
@@ -4601,7 +4605,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- struct {const char* format_spec; va_list* args_ptr; int err_no; location_t* locus; void** x_data;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/pretty-print.h' line='34' column='1' id='type-id-209'>
+    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/pretty-print.h' line='34' column='1' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* format_spec -->
         <var-decl name='format_spec' type-id='type-id-8' visibility='default' filepath='../.././gcc/pretty-print.h' line='35' column='1'/>
@@ -4640,7 +4644,7 @@
     <!-- int linemap_compare_locations(line_maps*, source_location, source_location) -->
     <function-decl name='linemap_compare_locations' mangled-name='_Z25linemap_compare_locationsP9line_mapsjj' filepath='../.././gcc/../libcpp/include/line-map.h' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25linemap_compare_locationsP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -4649,7 +4653,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- struct {const char* file; int line; int column; bool sysp;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-210' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-211'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-212' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-213'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file -->
         <var-decl name='file' type-id='type-id-8' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
@@ -4668,13 +4672,13 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__ expanded_location -->
-    <typedef-decl name='expanded_location' type-id='type-id-211' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-210'/>
+    <typedef-decl name='expanded_location' type-id='type-id-213' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-212'/>
     <!-- expanded_location expand_location(source_location) -->
     <function-decl name='expand_location' mangled-name='_Z15expand_locationj' filepath='../.././gcc/input.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15expand_locationj'>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-210'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <!-- unsigned long int concat_length(const char*, ...) -->
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4711,7 +4715,7 @@
     <!-- int linemap_location_in_system_header_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_in_system_header_p' mangled-name='_Z35linemap_location_in_system_header_pP9line_mapsj' filepath='../.././gcc/../libcpp/include/line-map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z35linemap_location_in_system_header_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- int -->
@@ -4727,14 +4731,14 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- size_t (size_t) -->
-    <function-type size-in-bits='64' id='type-id-204'>
+    <function-type size-in-bits='64' id='type-id-206'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- typedef size_t -->
       <return type-id='type-id-5'/>
     </function-type>
     <!-- void* (void*, size_t) -->
-    <function-type size-in-bits='64' id='type-id-202'>
+    <function-type size-in-bits='64' id='type-id-204'>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -4776,13 +4780,13 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const pretty_printer -->
-    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-212'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-214'/>
     <!-- const pretty_printer* -->
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
     <!-- const char* pp_base_last_position_in_text(const pretty_printer*) -->
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
       <!-- parameter of type 'const pretty_printer*' -->
-      <parameter type-id='type-id-213' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-215' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-8'/>
     </function-decl>
@@ -4861,9 +4865,9 @@
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- void* (typedef size_t)* -->
-    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-217'/>
     <!-- void* (typedef size_t)* identifier_to_locale_alloc -->
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-215' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-217' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <!-- void (void*)* identifier_to_locale_free -->
     <var-decl name='identifier_to_locale_free' type-id='type-id-143' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <!-- char* xstrerror(int) -->
@@ -4895,28 +4899,28 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- typedef void* iconv_t -->
-    <typedef-decl name='iconv_t' type-id='type-id-2' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-216'/>
+    <typedef-decl name='iconv_t' type-id='type-id-2' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-218'/>
     <!-- size_t* -->
-    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-219'/>
     <!-- size_t iconv(iconv_t, char**, size_t*, char**, size_t*) -->
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-216'/>
+      <parameter type-id='type-id-218'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-30'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-219'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-30'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-219'/>
       <!-- typedef size_t -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int iconv_close(iconv_t) -->
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-216'/>
+      <parameter type-id='type-id-218'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
@@ -4927,10 +4931,10 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- typedef iconv_t -->
-      <return type-id='type-id-216'/>
+      <return type-id='type-id-218'/>
     </function-decl>
     <!-- void* (size_t) -->
-    <function-type size-in-bits='64' id='type-id-214'>
+    <function-type size-in-bits='64' id='type-id-216'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- void* -->
@@ -4987,11 +4991,11 @@
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- typedef int nl_item -->
-    <typedef-decl name='nl_item' type-id='type-id-3' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-218'/>
+    <typedef-decl name='nl_item' type-id='type-id-3' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-220'/>
     <!-- char* nl_langinfo(nl_item) -->
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef nl_item' -->
-      <parameter type-id='type-id-218'/>
+      <parameter type-id='type-id-220'/>
       <!-- char* -->
       <return type-id='type-id-9'/>
     </function-decl>
@@ -5005,13 +5009,13 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- wchar_t -->
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-219'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-221'/>
     <!-- wchar_t* -->
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
     <!-- size_t mbstowcs(wchar_t*, const char*, size_t) -->
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'wchar_t*' -->
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-222'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -5020,13 +5024,13 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- const wchar_t -->
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-221'/>
+    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-223'/>
     <!-- const wchar_t* -->
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
     <!-- int wcswidth(const wchar_t*, size_t) -->
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const wchar_t*' -->
-      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-224'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- int -->
@@ -5052,11 +5056,11 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- line_maps* line_table -->
-    <var-decl name='line_table' type-id='type-id-206' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-208' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <!-- location_t input_location -->
     <var-decl name='input_location' type-id='type-id-107' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
     <!-- struct {const char* file; int line; int column; bool sysp;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-223'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-225'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* file -->
         <var-decl name='file' type-id='type-id-8' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
@@ -5077,16 +5081,16 @@
     <!-- expanded_location linemap_expand_location(line_maps*, const line_map*, source_location) -->
     <function-decl name='linemap_expand_location' mangled-name='_Z23linemap_expand_locationP9line_mapsPK8line_mapj' filepath='../.././gcc/../libcpp/include/line-map.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23linemap_expand_locationP9line_mapsPK8line_mapj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-78'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- typedef expanded_location -->
-      <return type-id='type-id-210'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <!-- struct linemap_stats -->
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-224'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-226'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int linemap_stats::num_ordinary_maps_allocated -->
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
@@ -5133,71 +5137,65 @@
       </data-member>
     </class-decl>
     <!-- linemap_stats* -->
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
     <!-- void linemap_get_statistics(line_maps*, linemap_stats*) -->
     <function-decl name='linemap_get_statistics' mangled-name='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats' filepath='../.././gcc/../libcpp/include/line-map.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'linemap_stats*' -->
-      <parameter type-id='type-id-225'/>
+      <parameter type-id='type-id-227'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/version.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'>
 
-    <!-- char[6] -->
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='48' id='type-id-226'>
+    <!-- const char[6] -->
+    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='48' id='type-id-228'>
       <!-- <anonymous range>[6] -->
-      <subrange length='6' type-id='type-id-22' id='type-id-227'/>
+      <subrange length='6' type-id='type-id-22' id='type-id-229'/>
 
     </array-type-def>
-    <!-- char[6] const -->
-    <qualified-type-def type-id='type-id-226' const='yes' id='type-id-228'/>
-    <!-- char[6] const version_string -->
+    <!-- const char version_string[6] -->
     <var-decl name='version_string' type-id='type-id-228' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
 
-    <!-- char[7] -->
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='56' id='type-id-229'>
+    <!-- const char[7] -->
+    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='56' id='type-id-230'>
       <!-- <anonymous range>[7] -->
-      <subrange length='7' type-id='type-id-22' id='type-id-230'/>
+      <subrange length='7' type-id='type-id-22' id='type-id-231'/>
 
     </array-type-def>
-    <!-- char[7] const -->
-    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-231'/>
-    <!-- char[7] const pkgversion_string -->
-    <var-decl name='pkgversion_string' type-id='type-id-231' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <!-- const char pkgversion_string[7] -->
+    <var-decl name='pkgversion_string' type-id='type-id-230' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
 
-    <!-- char[31] -->
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='248' id='type-id-232'>
+    <!-- const char[31] -->
+    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='248' id='type-id-232'>
       <!-- <anonymous range>[31] -->
       <subrange length='31' type-id='type-id-22' id='type-id-233'/>
 
     </array-type-def>
-    <!-- char[31] const -->
-    <qualified-type-def type-id='type-id-232' const='yes' id='type-id-234'/>
-    <!-- char[31] const bug_report_url -->
-    <var-decl name='bug_report_url' type-id='type-id-234' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <!-- const char bug_report_url[31] -->
+    <var-decl name='bug_report_url' type-id='type-id-232' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <!-- 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*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void linemap_check_files_exited(line_maps*) -->
     <function-decl name='linemap_check_files_exited' mangled-name='_Z26linemap_check_files_exitedP9line_maps' filepath='../.././libcpp/line-map.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26linemap_check_files_exitedP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const line_map* linemap_add(line_maps*, lc_reason, unsigned int, const char*, linenum_type) -->
     <function-decl name='linemap_add' mangled-name='_Z11linemap_addP9line_maps9lc_reasonjPKcj' filepath='../.././libcpp/line-map.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11linemap_addP9line_maps9lc_reasonjPKcj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-130' name='reason' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -5212,19 +5210,19 @@
     <!-- bool linemap_tracks_macro_expansion_locs_p(line_maps*) -->
     <function-decl name='linemap_tracks_macro_expansion_locs_p' mangled-name='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps' filepath='../.././libcpp/line-map.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- typedef cpp_hashnode cpp_hashnode -->
-    <typedef-decl name='cpp_hashnode' type-id='type-id-135' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-235'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-135' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-234'/>
     <!-- typedef cpp_token cpp_token -->
-    <typedef-decl name='cpp_token' type-id='type-id-153' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-236'/>
+    <typedef-decl name='cpp_token' type-id='type-id-155' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-235'/>
 
     <!-- const line_map* linemap_enter_macro(line_maps*, cpp_hashnode*, source_location, unsigned int) -->
     <function-decl name='linemap_enter_macro' mangled-name='linemap_enter_macro' filepath='../.././libcpp/line-map.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_enter_macro'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='macro_node' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -5250,7 +5248,7 @@
     <!-- source_location linemap_line_start(line_maps*, linenum_type, unsigned int) -->
     <function-decl name='linemap_line_start' mangled-name='_Z18linemap_line_startP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18linemap_line_startP9line_mapsjj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-131' name='to_line' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -5261,7 +5259,7 @@
     <!-- source_location linemap_position_for_column(line_maps*, unsigned int) -->
     <function-decl name='linemap_position_for_column' mangled-name='_Z27linemap_position_for_columnP9line_mapsj' filepath='../.././libcpp/line-map.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27linemap_position_for_columnP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='to_column' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <!-- typedef source_location -->
@@ -5270,7 +5268,7 @@
     <!-- source_location linemap_position_for_line_and_column(line_map*, linenum_type, unsigned int) -->
     <function-decl name='linemap_position_for_line_and_column' mangled-name='_Z36linemap_position_for_line_and_columnP8line_mapjj' filepath='../.././libcpp/line-map.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z36linemap_position_for_line_and_columnP8line_mapjj'>
       <!-- parameter of type 'line_map*' -->
-      <parameter type-id='type-id-201' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
+      <parameter type-id='type-id-203' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
       <!-- parameter of type 'typedef linenum_type' -->
       <parameter type-id='type-id-131' name='line' filepath='../.././libcpp/line-map.c' line='496' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -5281,7 +5279,7 @@
     <!-- const line_map* linemap_lookup(line_maps*, source_location) -->
     <function-decl name='linemap_lookup' mangled-name='_Z14linemap_lookupP9line_mapsj' filepath='../.././libcpp/line-map.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14linemap_lookupP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106' name='line' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <!-- const line_map* -->
@@ -5297,7 +5295,7 @@
     <!-- int linemap_get_expansion_line(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_line' mangled-name='linemap_get_expansion_line' filepath='../.././libcpp/line-map.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_line'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- int -->
@@ -5306,7 +5304,7 @@
     <!-- const char* linemap_get_expansion_filename(line_maps*, source_location) -->
     <function-decl name='linemap_get_expansion_filename' mangled-name='linemap_get_expansion_filename' filepath='../.././libcpp/line-map.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_filename'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106' name='location' filepath='../.././libcpp/line-map.c' line='720' column='1'/>
       <!-- const char* -->
@@ -5322,7 +5320,7 @@
     <!-- bool linemap_location_from_macro_expansion_p(line_maps*, source_location) -->
     <function-decl name='linemap_location_from_macro_expansion_p' mangled-name='_Z39linemap_location_from_macro_expansion_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z39linemap_location_from_macro_expansion_pP9line_mapsj'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106' name='location' filepath='../.././libcpp/line-map.c' line='773' column='1'/>
       <!-- bool -->
@@ -5331,11 +5329,11 @@
     <!-- source_location linemap_unwind_toward_expansion(line_maps*, source_location, const line_map**) -->
     <function-decl name='linemap_unwind_toward_expansion' mangled-name='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map' filepath='../.././libcpp/line-map.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106' name='loc' filepath='../.././libcpp/line-map.c' line='1094' column='1'/>
       <!-- parameter of type 'const line_map**' -->
-      <parameter type-id='type-id-208' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
+      <parameter type-id='type-id-210' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
       <!-- typedef source_location -->
       <return type-id='type-id-106'/>
     </function-decl>
@@ -5344,7 +5342,7 @@
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='stream' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='ix' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <!-- parameter of type 'bool' -->
@@ -5355,7 +5353,7 @@
     <!-- void linemap_dump_location(line_maps*, source_location, FILE*) -->
     <function-decl name='linemap_dump_location' mangled-name='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE' filepath='../.././libcpp/line-map.c' line='1211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE'>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106' name='loc' filepath='../.././libcpp/line-map.c' line='1212' column='1'/>
       <!-- parameter of type 'FILE*' -->
@@ -5368,7 +5366,7 @@
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='stream' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='num_ordinary' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -5388,21 +5386,21 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.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'>
     <!-- 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-237'>
+    <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-236'>
       <member-type access='public'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} -->
-        <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-238'>
+        <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-237'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- unsigned char* base -->
-            <var-decl name='base' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
             <!-- unsigned char* limit -->
-            <var-decl name='limit' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
             <!-- unsigned char* cur -->
-            <var-decl name='cur' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <!-- source_location first_line -->
@@ -5412,19 +5410,19 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_buffer* cpp_reader::buffer -->
-        <var-decl name='buffer' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_buffer* cpp_reader::overlaid_buffer -->
-        <var-decl name='overlaid_buffer' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- lexer_state cpp_reader::state -->
-        <var-decl name='state' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- line_maps* cpp_reader::line_table -->
-        <var-decl name='line_table' type-id='type-id-206' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- source_location cpp_reader::directive_line -->
@@ -5432,31 +5430,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- _cpp_buff* cpp_reader::a_buff -->
-        <var-decl name='a_buff' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- _cpp_buff* cpp_reader::u_buff -->
-        <var-decl name='u_buff' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_buff* cpp_reader::free_buffs -->
-        <var-decl name='free_buffs' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- cpp_context cpp_reader::base_context -->
-        <var-decl name='base_context' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <!-- cpp_context* cpp_reader::context -->
-        <var-decl name='context' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
         <!-- const directive* cpp_reader::directive -->
-        <var-decl name='directive' type-id='type-id-245' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
       </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-236' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-235' 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 -->
@@ -5468,39 +5466,39 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
         <!-- cpp_dir* cpp_reader::quote_include -->
-        <var-decl name='quote_include' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-245' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
         <!-- cpp_dir* cpp_reader::bracket_include -->
-        <var-decl name='bracket_include' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-245' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
         <!-- cpp_dir cpp_reader::no_search_path -->
-        <var-decl name='no_search_path' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
         <!-- _cpp_file* cpp_reader::all_files -->
-        <var-decl name='all_files' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
         <!-- _cpp_file* cpp_reader::main_file -->
-        <var-decl name='main_file' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <!-- htab* cpp_reader::file_hash -->
-        <var-decl name='file_hash' type-id='type-id-192' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-194' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
         <!-- htab* cpp_reader::dir_hash -->
-        <var-decl name='dir_hash' type-id='type-id-192' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-194' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
         <!-- file_hash_entry_pool* cpp_reader::file_hash_entries -->
-        <var-decl name='file_hash_entries' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
         <!-- htab* cpp_reader::nonexistent_file_hash -->
-        <var-decl name='nonexistent_file_hash' type-id='type-id-192' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-194' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <!-- obstack cpp_reader::nonexistent_file_ob -->
@@ -5516,11 +5514,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
         <!-- const cpp_hashnode* cpp_reader::mi_cmacro -->
-        <var-decl name='mi_cmacro' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
         <!-- const cpp_hashnode* cpp_reader::mi_ind_cmacro -->
-        <var-decl name='mi_ind_cmacro' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <!-- bool cpp_reader::mi_valid -->
@@ -5528,15 +5526,15 @@
       </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-155' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-157' 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 -->
-        <var-decl name='base_run' type-id='type-id-251' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
         <!-- tokenrun* cpp_reader::cur_run -->
-        <var-decl name='cur_run' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-251' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <!-- unsigned int cpp_reader::lookaheads -->
@@ -5548,7 +5546,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
         <!-- unsigned char* cpp_reader::macro_buffer -->
-        <var-decl name='macro_buffer' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <!-- unsigned int cpp_reader::macro_buffer_len -->
@@ -5556,43 +5554,43 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
         <!-- cset_converter cpp_reader::narrow_cset_desc -->
-        <var-decl name='narrow_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
         <!-- cset_converter cpp_reader::utf8_cset_desc -->
-        <var-decl name='utf8_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
         <!-- cset_converter cpp_reader::char16_cset_desc -->
-        <var-decl name='char16_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
         <!-- cset_converter cpp_reader::char32_cset_desc -->
-        <var-decl name='char32_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
         <!-- cset_converter cpp_reader::wide_cset_desc -->
-        <var-decl name='wide_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
         <!-- const unsigned char* cpp_reader::date -->
-        <var-decl name='date' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
+        <var-decl name='date' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
         <!-- const unsigned char* cpp_reader::time -->
-        <var-decl name='time' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
+        <var-decl name='time' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
       </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-236' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-235' 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-236' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-235' 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 -->
-        <var-decl name='deps' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <!-- obstack cpp_reader::hash_ob -->
@@ -5604,31 +5602,31 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
         <!-- pragma_entry* cpp_reader::pragmas -->
-        <var-decl name='pragmas' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
         <!-- cpp_callbacks cpp_reader::cb -->
-        <var-decl name='cb' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
         <!-- ht* cpp_reader::hash_table -->
-        <var-decl name='hash_table' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
         <!-- op* cpp_reader::op_stack -->
-        <var-decl name='op_stack' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
         <!-- op* cpp_reader::op_limit -->
-        <var-decl name='op_limit' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
         <!-- cpp_options cpp_reader::opts -->
-        <var-decl name='opts' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
         <!-- spec_nodes cpp_reader::spec_nodes -->
-        <var-decl name='spec_nodes' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <!-- bool cpp_reader::our_hashtable -->
@@ -5636,23 +5634,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
         <!-- struct {unsigned char* base; unsigned char* limit; unsigned char* cur; source_location first_line;} cpp_reader::out -->
-        <var-decl name='out' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-237' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
         <!-- const unsigned char* cpp_reader::saved_cur -->
-        <var-decl name='saved_cur' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_cur' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
         <!-- const unsigned char* cpp_reader::saved_rlimit -->
-        <var-decl name='saved_rlimit' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_rlimit' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
         <!-- const unsigned char* cpp_reader::saved_line_base -->
-        <var-decl name='saved_line_base' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_line_base' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
         <!-- cpp_savedstate* cpp_reader::savedstate -->
-        <var-decl name='savedstate' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <!-- unsigned int cpp_reader::counter -->
@@ -5660,11 +5658,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
         <!-- cpp_comment_table cpp_reader::comments -->
-        <var-decl name='comments' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
         <!-- def_pragma_macro* cpp_reader::pushed_macros -->
-        <var-decl name='pushed_macros' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <!-- source_location* cpp_reader::forced_token_location_p -->
@@ -5672,32 +5670,32 @@
       </data-member>
     </class-decl>
     <!-- unsigned char* -->
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-238'/>
     <!-- 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-264'>
+    <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-263'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* cpp_buffer::cur -->
-        <var-decl name='cur' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
+        <var-decl name='cur' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const unsigned char* cpp_buffer::line_base -->
-        <var-decl name='line_base' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='300' column='1'/>
+        <var-decl name='line_base' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const unsigned char* cpp_buffer::next_line -->
-        <var-decl name='next_line' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='301' column='1'/>
+        <var-decl name='next_line' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- const unsigned char* cpp_buffer::buf -->
-        <var-decl name='buf' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='303' column='1'/>
+        <var-decl name='buf' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='303' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const unsigned char* cpp_buffer::rlimit -->
-        <var-decl name='rlimit' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
+        <var-decl name='rlimit' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
       </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-265' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-264' 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 -->
@@ -5713,19 +5711,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_buffer* cpp_buffer::prev -->
-        <var-decl name='prev' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- _cpp_file* cpp_buffer::file -->
-        <var-decl name='file' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- const unsigned char* cpp_buffer::timestamp -->
-        <var-decl name='timestamp' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
+        <var-decl name='timestamp' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
       </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-266' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-265' 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 -->
@@ -5749,18 +5747,18 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <!-- cpp_dir cpp_buffer::dir -->
-        <var-decl name='dir' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <!-- cset_converter cpp_buffer::input_cset_desc -->
-        <var-decl name='input_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
     <!-- 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-267'>
+    <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-266'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const unsigned char* _cpp_line_note::pos -->
-        <var-decl name='pos' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
+        <var-decl name='pos' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned int _cpp_line_note::type -->
@@ -5768,13 +5766,13 @@
       </data-member>
     </class-decl>
     <!-- typedef _cpp_line_note _cpp_line_note -->
-    <typedef-decl name='_cpp_line_note' type-id='type-id-267' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-268'/>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-266' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-267'/>
     <!-- _cpp_line_note* -->
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-265'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-264'/>
     <!-- cpp_buffer* -->
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-240'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-239'/>
     <!-- struct _cpp_file -->
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-269'>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-268'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* _cpp_file::name -->
         <var-decl name='name' type-id='type-id-8' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
@@ -5793,23 +5791,23 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- _cpp_file* _cpp_file::next_file -->
-        <var-decl name='next_file' type-id='type-id-248' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-247' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- const uchar* _cpp_file::buffer -->
-        <var-decl name='buffer' type-id='type-id-270' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-269' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- const uchar* _cpp_file::buffer_start -->
-        <var-decl name='buffer_start' type-id='type-id-270' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-269' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- const cpp_hashnode* _cpp_file::cmacro -->
-        <var-decl name='cmacro' type-id='type-id-250' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-249' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <!-- cpp_dir* _cpp_file::dir -->
-        <var-decl name='dir' type-id='type-id-246' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-245' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- stat _cpp_file::st -->
@@ -5845,16 +5843,16 @@
       </data-member>
     </class-decl>
     <!-- _cpp_file* -->
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-248'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-247'/>
     <!-- struct if_stack -->
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-271'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-270'/>
     <!-- if_stack* -->
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-266'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-265'/>
     <!-- struct cpp_dir -->
-    <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-247'>
+    <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-246'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_dir* cpp_dir::next -->
-        <var-decl name='next' type-id='type-id-246' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-245' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* cpp_dir::name -->
@@ -5878,40 +5876,40 @@
       </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-272' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-271' 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-273' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-272' 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-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-273' 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-275' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
     <!-- cpp_dir* -->
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-246'/>
+    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-245'/>
     <!-- const char** -->
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-272'/>
+    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-271'/>
     <!-- char* (const char*, cpp_dir*)* -->
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-272'/>
     <!-- typedef __ino_t ino_t -->
-    <typedef-decl name='ino_t' type-id='type-id-45' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-274'/>
+    <typedef-decl name='ino_t' type-id='type-id-45' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-273'/>
     <!-- typedef __dev_t dev_t -->
-    <typedef-decl name='dev_t' type-id='type-id-44' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-275'/>
+    <typedef-decl name='dev_t' type-id='type-id-44' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-274'/>
     <!-- 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-253'>
+    <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-252'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- convert_f cset_converter::func -->
-        <var-decl name='func' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-276' 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 -->
-        <var-decl name='cd' type-id='type-id-216' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-218' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- int cset_converter::width -->
@@ -5919,17 +5917,17 @@
       </data-member>
     </class-decl>
     <!-- struct _cpp_strbuf -->
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-278'/>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
     <!-- _cpp_strbuf* -->
-    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
     <!-- bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* -->
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-281'/>
+    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
     <!-- typedef bool (typedef iconv_t, const unsigned char*, typedef size_t, _cpp_strbuf*)* convert_f -->
-    <typedef-decl name='convert_f' type-id='type-id-281' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-277'/>
+    <typedef-decl name='convert_f' type-id='type-id-280' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-276'/>
     <!-- typedef cpp_buffer cpp_buffer -->
-    <typedef-decl name='cpp_buffer' type-id='type-id-264' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-282'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-263' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-281'/>
     <!-- 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-241'>
+    <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-240'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned char lexer_state::in_directive -->
         <var-decl name='in_directive' type-id='type-id-132' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
@@ -5988,75 +5986,75 @@
       </data-member>
     </class-decl>
     <!-- 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-283'>
+    <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-282'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- _cpp_buff* _cpp_buff::next -->
-        <var-decl name='next' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- unsigned char* _cpp_buff::base -->
-        <var-decl name='base' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* _cpp_buff::cur -->
-        <var-decl name='cur' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- unsigned char* _cpp_buff::limit -->
-        <var-decl name='limit' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
     <!-- _cpp_buff* -->
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-241'/>
     <!-- typedef _cpp_buff _cpp_buff -->
-    <typedef-decl name='_cpp_buff' type-id='type-id-283' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-284'/>
+    <typedef-decl name='_cpp_buff' type-id='type-id-282' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-283'/>
     <!-- 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-243'>
+    <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-242'>
       <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-285'>
+        <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-284'>
           <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-286'>
+            <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-285'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- utoken first -->
-                <var-decl name='first' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-286' 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-287' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-286' 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__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-288'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-287'>
               <data-member access='public' layout-offset-in-bits='0'>
                 <!-- const unsigned char* cur -->
-                <var-decl name='cur' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
+                <var-decl name='cur' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
                 <!-- const unsigned char* rlimit -->
-                <var-decl name='rlimit' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='197' column='1'/>
+                <var-decl name='rlimit' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='197' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <data-member access='private'>
             <!-- struct {utoken first; utoken last;} iso -->
-            <var-decl name='iso' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-285' 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-288' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-287' 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__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-289'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-288'>
           <data-member access='private'>
             <!-- macro_context* mc -->
-            <var-decl name='mc' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <!-- cpp_hashnode* macro -->
@@ -6066,48 +6064,48 @@
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_context* cpp_context::next -->
-        <var-decl name='next' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_context* cpp_context::prev -->
-        <var-decl name='prev' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </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-285' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-284' 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 -->
-        <var-decl name='buff' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
       </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-289' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-288' 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-291' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-290' 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-287'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-286'>
       <data-member access='private'>
         <!-- const cpp_token* utoken::token -->
-        <var-decl name='token' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- const cpp_token** utoken::ptoken -->
-        <var-decl name='ptoken' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
     <!-- const cpp_token -->
-    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-294'/>
+    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-293'/>
     <!-- const cpp_token* -->
-    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-292'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-291'/>
     <!-- const cpp_token** -->
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
     <!-- 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-295' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-296'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* macro_node -->
         <var-decl name='macro_node' type-id='type-id-133' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
@@ -6122,60 +6120,60 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__ macro_context -->
-    <typedef-decl name='macro_context' type-id='type-id-296' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-295'/>
+    <typedef-decl name='macro_context' type-id='type-id-295' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-294'/>
     <!-- macro_context* -->
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-289'/>
     <!-- cpp_context* -->
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
     <!-- enum context_tokens_kind -->
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-291'>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-290'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='TOKENS_KIND_INDIRECT' value='0'/>
       <enumerator name='TOKENS_KIND_DIRECT' value='1'/>
       <enumerator name='TOKENS_KIND_EXTENDED' value='2'/>
     </enum-decl>
     <!-- struct directive -->
-    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-297'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-296'/>
     <!-- const directive -->
-    <qualified-type-def type-id='type-id-297' const='yes' id='type-id-298'/>
+    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-297'/>
     <!-- const directive* -->
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-244'/>
     <!-- struct file_hash_entry_pool -->
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-299'/>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-298'/>
     <!-- file_hash_entry_pool* -->
-    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-248'/>
     <!-- const cpp_hashnode -->
-    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-300'/>
+    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-299'/>
     <!-- const cpp_hashnode* -->
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-249'/>
     <!-- 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-301'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-300'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- tokenrun* tokenrun::next -->
-        <var-decl name='next' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-251' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- tokenrun* tokenrun::prev -->
-        <var-decl name='prev' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-251' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- cpp_token* tokenrun::base -->
-        <var-decl name='base' type-id='type-id-155' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-157' 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-155' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-157' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
     <!-- tokenrun* -->
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-251'/>
     <!-- typedef tokenrun tokenrun -->
-    <typedef-decl name='tokenrun' type-id='type-id-301' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-251'/>
+    <typedef-decl name='tokenrun' type-id='type-id-300' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-250'/>
     <!-- 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-302'>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-301'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char** deps::targetv -->
-        <var-decl name='targetv' type-id='type-id-272' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-271' 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 -->
@@ -6187,7 +6185,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char** deps::depv -->
-        <var-decl name='depv' type-id='type-id-272' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-271' 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 -->
@@ -6199,11 +6197,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- const char** deps::vpathv -->
-        <var-decl name='vpathv' type-id='type-id-272' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-271' 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 -->
-        <var-decl name='vpathlv' type-id='type-id-217' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-219' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- unsigned int deps::nvpaths -->
@@ -6215,147 +6213,147 @@
       </data-member>
     </class-decl>
     <!-- deps* -->
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-254'/>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-253'/>
     <!-- struct pragma_entry -->
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-302'/>
     <!-- pragma_entry* -->
-    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-255'/>
+    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-254'/>
     <!-- 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-256'>
+    <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-255'>
       <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-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-303' 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-305' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-304' 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-306' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-305' 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-307' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-306' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-307' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-307' 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-309' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-308' 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-310' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-309' 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-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-310' 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-312' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-311' 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-313' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-312' 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-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-313' 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-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-314' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-307' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-307' 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-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-315' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-307' 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-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef cpp_reader cpp_reader -->
-    <typedef-decl name='cpp_reader' type-id='type-id-237' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-318'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-236' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-317'/>
     <!-- cpp_reader* -->
-    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
     <!-- void (cpp_reader*, const cpp_token*, int)* -->
-    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-304'/>
+    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-303'/>
     <!-- void (cpp_reader*, const line_map*)* -->
-    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-304'/>
     <!-- void (cpp_reader*, const char*)* -->
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-306'/>
+    <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-305'/>
     <!-- void (cpp_reader*, typedef source_location, const unsigned char*, const char*, int, const cpp_token**)* -->
-    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-306'/>
     <!-- void (cpp_reader*, typedef source_location, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-307'/>
     <!-- typedef cpp_string cpp_string -->
-    <typedef-decl name='cpp_string' type-id='type-id-159' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-325'/>
+    <typedef-decl name='cpp_string' type-id='type-id-161' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-324'/>
     <!-- const cpp_string -->
-    <qualified-type-def type-id='type-id-325' const='yes' id='type-id-326'/>
+    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-325'/>
     <!-- const cpp_string* -->
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-327'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
     <!-- void (cpp_reader*, typedef source_location, const cpp_string*)* -->
-    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-308'/>
     <!-- void (cpp_reader*, typedef source_location)* -->
-    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-310'/>
+    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-309'/>
     <!-- int (cpp_reader*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-310'/>
     <!-- void (cpp_reader*, const char*, int, const char*)* -->
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-311'/>
     <!-- typedef cpp_dir cpp_dir -->
-    <typedef-decl name='cpp_dir' type-id='type-id-247' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-332'/>
+    <typedef-decl name='cpp_dir' type-id='type-id-246' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-331'/>
     <!-- cpp_dir** -->
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-332'/>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**)* -->
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
     <!-- typedef const char* (cpp_reader*, const char*, cpp_dir**)* missing_header_cb -->
-    <typedef-decl name='missing_header_cb' type-id='type-id-335' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-313'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-334' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-312'/>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*)* -->
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-314'/>
+    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-313'/>
     <!-- bool (cpp_reader*, int, int, typedef source_location, unsigned int, const char*, va_list*)* -->
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-314'/>
     <!-- void (cpp_reader*)* -->
-    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-316'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-315'/>
     <!-- bool (cpp_reader*, cpp_hashnode*)* -->
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-316'/>
     <!-- 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-340'>
+    <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-339'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- obstack ht::stack -->
         <var-decl name='stack' type-id='type-id-31' 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-341' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-340' 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-342' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-341' 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 -->
-        <var-decl name='alloc_subobject' type-id='type-id-215' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-217' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <!-- unsigned int ht::nslots -->
@@ -6367,7 +6365,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <!-- cpp_reader* ht::pfile -->
-        <var-decl name='pfile' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <!-- unsigned int ht::searches -->
@@ -6383,28 +6381,28 @@
       </data-member>
     </class-decl>
     <!-- ht_identifier* -->
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-342'/>
     <!-- typedef ht_identifier* hashnode -->
-    <typedef-decl name='hashnode' type-id='type-id-343' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-344'/>
+    <typedef-decl name='hashnode' type-id='type-id-342' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-343'/>
     <!-- hashnode* -->
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-340'/>
     <!-- typedef ht hash_table -->
-    <typedef-decl name='hash_table' type-id='type-id-340' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-345'/>
+    <typedef-decl name='hash_table' type-id='type-id-339' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-344'/>
     <!-- hash_table* -->
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
     <!-- typedef hashnode (hash_table*)* -->
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-341'/>
     <!-- ht* -->
-    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-256'/>
     <!-- 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-348'>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const cpp_token* op::token -->
-        <var-decl name='token' type-id='type-id-292' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-291' 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-349' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-348' 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 -->
@@ -6412,19 +6410,19 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <!-- cpp_ttype op::op -->
-        <var-decl name='op' type-id='type-id-161' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-163' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
     <!-- op* -->
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-258'/>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-257'/>
     <!-- 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-259'>
+    <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-258'>
       <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-350'>
+        <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-349'>
           <data-member access='public' layout-offset-in-bits='0'>
             <!-- cpp_deps_style style -->
-            <var-decl name='style' type-id='type-id-351' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-350' 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 -->
@@ -6450,7 +6448,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-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-351' 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 -->
@@ -6618,7 +6616,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-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-352' 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 -->
@@ -6630,7 +6628,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-350' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-349' 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 -->
@@ -6670,14 +6668,14 @@
       </data-member>
     </class-decl>
     <!-- enum cpp_deps_style -->
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-351'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-350'>
       <underlying-type type-id='type-id-92'/>
       <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-352'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-351'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -6693,7 +6691,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-353'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-352'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='normalized_KC' value='0'/>
       <enumerator name='normalized_C' value='1'/>
@@ -6701,7 +6699,7 @@
       <enumerator name='normalized_none' value='3'/>
     </enum-decl>
     <!-- struct spec_nodes -->
-    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-260'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-259'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_hashnode* spec_nodes::n_defined -->
         <var-decl name='n_defined' type-id='type-id-133' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
@@ -6720,14 +6718,14 @@
       </data-member>
     </class-decl>
     <!-- struct cpp_savedstate -->
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-354'/>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-353'/>
     <!-- cpp_savedstate* -->
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-261'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-260'/>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-262' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-355'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-261' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-354'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -6739,7 +6737,7 @@
       </data-member>
     </class-decl>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-357' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-358'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-357'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-9' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -6750,16 +6748,16 @@
       </data-member>
     </class-decl>
     <!-- typedef __anonymous_struct__ cpp_comment -->
-    <typedef-decl name='cpp_comment' type-id='type-id-358' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-357'/>
+    <typedef-decl name='cpp_comment' type-id='type-id-357' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-356'/>
     <!-- cpp_comment* -->
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-355'/>
     <!-- typedef __anonymous_struct__ cpp_comment_table -->
-    <typedef-decl name='cpp_comment_table' type-id='type-id-355' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-262'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-354' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-261'/>
     <!-- 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-359'>
+    <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-358'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- def_pragma_macro* def_pragma_macro::next -->
-        <var-decl name='next' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- char* def_pragma_macro::name -->
@@ -6767,7 +6765,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- unsigned char* def_pragma_macro::definition -->
-        <var-decl name='definition' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- source_location def_pragma_macro::line -->
@@ -6787,11 +6785,11 @@
       </data-member>
     </class-decl>
     <!-- def_pragma_macro* -->
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-262'/>
     <!-- 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*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <!-- parameter of type 'void*' -->
@@ -6800,41 +6798,41 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- typedef unsigned char uchar -->
-    <typedef-decl name='uchar' type-id='type-id-132' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-360'/>
+    <typedef-decl name='uchar' type-id='type-id-132' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-359'/>
     <!-- const uchar -->
-    <qualified-type-def type-id='type-id-360' const='yes' id='type-id-361'/>
+    <qualified-type-def type-id='type-id-359' const='yes' id='type-id-360'/>
     <!-- const uchar* -->
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-269'/>
     <!-- const uchar* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' mangled-name='_cpp_builtin_macro_text' filepath='../.././libcpp/macro.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_builtin_macro_text'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <!-- const uchar* -->
-      <return type-id='type-id-270'/>
+      <return type-id='type-id-269'/>
     </function-decl>
     <!-- uchar* -->
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-361'/>
     <!-- uchar* cpp_quote_string(uchar*, const uchar*, unsigned int) -->
     <function-decl name='cpp_quote_string' mangled-name='_Z16cpp_quote_stringPhPKhj' filepath='../.././libcpp/macro.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_quote_stringPhPKhj'>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-362' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-361' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-270' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-269' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='len' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-362'/>
+      <return type-id='type-id-361'/>
     </function-decl>
     <!-- bool _cpp_arguments_ok(cpp_reader*, cpp_macro*, const cpp_hashnode*, unsigned int) -->
     <function-decl name='_cpp_arguments_ok' mangled-name='_cpp_arguments_ok' filepath='../.././libcpp/macro.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_arguments_ok'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-145' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-147' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'const cpp_hashnode*' -->
-      <parameter type-id='type-id-250' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-249' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='argc' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <!-- bool -->
@@ -6843,11 +6841,11 @@
     <!-- void _cpp_push_token_context(cpp_reader*, cpp_hashnode*, const cpp_token*, unsigned int) -->
     <function-decl name='_cpp_push_token_context' mangled-name='_cpp_push_token_context' filepath='../.././libcpp/macro.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_token_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='macro' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
+      <parameter type-id='type-id-291' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <!-- void -->
@@ -6856,11 +6854,11 @@
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const uchar*, size_t) -->
     <function-decl name='_cpp_push_text_context' mangled-name='_cpp_push_text_context' filepath='../.././libcpp/macro.c' line='1830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_text_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='macro' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-270' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
+      <parameter type-id='type-id-269' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <!-- void -->
@@ -6869,21 +6867,21 @@
     <!-- void _cpp_pop_context(cpp_reader*) -->
     <function-decl name='_cpp_pop_context' mangled-name='_cpp_pop_context' filepath='../.././libcpp/macro.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_context'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int cpp_sys_macro_p(cpp_reader*) -->
     <function-decl name='cpp_sys_macro_p' mangled-name='_Z15cpp_sys_macro_pP10cpp_reader' filepath='../.././libcpp/macro.c' line='2437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_sys_macro_pP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- void _cpp_backup_tokens_direct(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -6892,7 +6890,7 @@
     <!-- void _cpp_backup_tokens(cpp_reader*, unsigned int) -->
     <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <!-- void -->
@@ -6901,23 +6899,23 @@
     <!-- const cpp_token* cpp_get_token_with_location(cpp_reader*, source_location*) -->
     <function-decl name='cpp_get_token_with_location' mangled-name='_Z27cpp_get_token_with_locationP10cpp_readerPj' filepath='../.././libcpp/macro.c' line='2424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_get_token_with_locationP10cpp_readerPj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-134' name='loc' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-292'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <!-- const cpp_token* cpp_get_token(cpp_reader*) -->
     <function-decl name='cpp_get_token' mangled-name='_Z13cpp_get_tokenP10cpp_reader' filepath='../.././libcpp/macro.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_get_tokenP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-292'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <!-- void cpp_scan_nooutput(cpp_reader*) -->
     <function-decl name='cpp_scan_nooutput' mangled-name='_Z17cpp_scan_nooutputP10cpp_reader' filepath='../.././libcpp/macro.c' line='2447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_scan_nooutputP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -6931,9 +6929,9 @@
     <!-- bool _cpp_save_parameter(cpp_reader*, cpp_macro*, cpp_hashnode*) -->
     <function-decl name='_cpp_save_parameter' mangled-name='_cpp_save_parameter' filepath='../.././libcpp/macro.c' line='2590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_parameter'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-145' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-147' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <!-- bool -->
@@ -6942,7 +6940,7 @@
     <!-- bool _cpp_create_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_create_definition' mangled-name='_cpp_create_definition' filepath='../.././libcpp/macro.c' line='2938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133'/>
       <!-- bool -->
@@ -6951,11 +6949,11 @@
     <!-- const unsigned char* cpp_macro_definition(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='cpp_macro_definition' mangled-name='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode' filepath='../.././libcpp/macro.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-146'/>
     </function-decl>
     <!-- unsigned int num_expanded_macros_counter -->
     <var-decl name='num_expanded_macros_counter' type-id='type-id-35' mangled-name='num_expanded_macros_counter' visibility='default' filepath='../.././libcpp/macro.c' line='170' column='1' elf-symbol-id='num_expanded_macros_counter'/>
@@ -6964,18 +6962,18 @@
     <!-- cpp_token* _cpp_temp_token(cpp_reader*) -->
     <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 of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-155'/>
+      <return type-id='type-id-157'/>
     </function-decl>
     <!-- _cpp_buff** -->
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-362'/>
     <!-- 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'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type '_cpp_buff**' -->
-      <parameter type-id='type-id-363'/>
+      <parameter type-id='type-id-362'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- void -->
@@ -6984,7 +6982,7 @@
     <!-- bool cpp_error(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char*' -->
@@ -6996,14 +6994,14 @@
     <!-- cpp_token* _cpp_lex_direct(cpp_reader*) -->
     <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 of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- cpp_token* -->
-      <return type-id='type-id-155'/>
+      <return type-id='type-id-157'/>
     </function-decl>
     <!-- bool cpp_warning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line' mangled-name='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='932' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7017,20 +7015,20 @@
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- typedef __time_t time_t -->
-    <typedef-decl name='time_t' type-id='type-id-54' filepath='/usr/include/time.h' line='76' column='1' id='type-id-364'/>
+    <typedef-decl name='time_t' type-id='type-id-54' filepath='/usr/include/time.h' line='76' column='1' id='type-id-363'/>
     <!-- time_t* -->
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-365'/>
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
     <!-- 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'>
       <!-- parameter of type 'time_t*' -->
-      <parameter type-id='type-id-365'/>
+      <parameter type-id='type-id-364'/>
       <!-- typedef time_t -->
-      <return type-id='type-id-364'/>
+      <return type-id='type-id-363'/>
     </function-decl>
     <!-- bool cpp_errno(cpp_reader*, int, const char*) -->
     <function-decl name='cpp_errno' mangled-name='_Z9cpp_errnoP10cpp_readeriPKc' filepath='../.././libcpp/include/cpplib.h' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errnoP10cpp_readeriPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char*' -->
@@ -7039,7 +7037,7 @@
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- struct tm -->
-    <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-366'>
+    <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-365'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int tm::tm_sec -->
         <var-decl name='tm_sec' type-id='type-id-3' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
@@ -7086,171 +7084,171 @@
       </data-member>
     </class-decl>
     <!-- tm* -->
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-367'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
     <!-- const time_t -->
-    <qualified-type-def type-id='type-id-364' const='yes' id='type-id-368'/>
+    <qualified-type-def type-id='type-id-363' const='yes' id='type-id-367'/>
     <!-- const time_t* -->
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-368'/>
     <!-- tm* localtime(const time_t*) -->
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const time_t*' -->
-      <parameter type-id='type-id-369'/>
+      <parameter type-id='type-id-368'/>
       <!-- tm* -->
-      <return type-id='type-id-367'/>
+      <return type-id='type-id-366'/>
     </function-decl>
     <!-- unsigned char* _cpp_unaligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_unaligned_alloc' mangled-name='_cpp_unaligned_alloc' filepath='../.././libcpp/internal.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_unaligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- typedef _cpp_file _cpp_file -->
-    <typedef-decl name='_cpp_file' type-id='type-id-269' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-370'/>
+    <typedef-decl name='_cpp_file' type-id='type-id-268' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-369'/>
     <!-- const char* _cpp_get_file_name(_cpp_file*) -->
     <function-decl name='_cpp_get_file_name' mangled-name='_cpp_get_file_name' filepath='../.././libcpp/internal.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_name'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- const char* -->
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- const tm -->
-    <qualified-type-def type-id='type-id-366' const='yes' id='type-id-371'/>
+    <qualified-type-def type-id='type-id-365' const='yes' id='type-id-370'/>
     <!-- const tm* -->
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-371'/>
     <!-- char* asctime(const tm*) -->
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const tm*' -->
-      <parameter type-id='type-id-372'/>
+      <parameter type-id='type-id-371'/>
       <!-- char* -->
       <return type-id='type-id-9'/>
     </function-decl>
     <!-- stat* _cpp_get_file_stat(_cpp_file*) -->
     <function-decl name='_cpp_get_file_stat' mangled-name='_cpp_get_file_stat' filepath='../.././libcpp/internal.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_stat'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- stat* -->
       <return type-id='type-id-56'/>
     </function-decl>
     <!-- _cpp_file* cpp_get_file(cpp_buffer*) -->
     <function-decl name='cpp_get_file' mangled-name='_Z12cpp_get_fileP10cpp_buffer' filepath='../.././libcpp/include/cpplib.h' line='1012' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_fileP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-240'/>
+      <parameter type-id='type-id-239'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_buffer(cpp_reader*) -->
     <function-decl name='cpp_get_buffer' mangled-name='_Z14cpp_get_bufferP10cpp_reader' filepath='../.././libcpp/include/cpplib.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_get_bufferP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const unsigned char*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/include/cpplib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <!-- void _cpp_clean_line(cpp_reader*) -->
     <function-decl name='_cpp_clean_line' mangled-name='_cpp_clean_line' filepath='../.././libcpp/internal.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_clean_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void _cpp_pop_buffer(cpp_reader*) -->
     <function-decl name='_cpp_pop_buffer' mangled-name='_cpp_pop_buffer' filepath='../.././libcpp/internal.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int _cpp_do__Pragma(cpp_reader*) -->
     <function-decl name='_cpp_do__Pragma' mangled-name='_cpp_do__Pragma' filepath='../.././libcpp/internal.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do__Pragma'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- void _cpp_free_buff(_cpp_buff*) -->
     <function-decl name='_cpp_free_buff' mangled-name='_cpp_free_buff' filepath='../.././libcpp/internal.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_buff'>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- unsigned char* cpp_token_as_text(cpp_reader*, const cpp_token*) -->
     <function-decl name='cpp_token_as_text' mangled-name='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- unsigned int cpp_token_len(const cpp_token*) -->
     <function-decl name='cpp_token_len' mangled-name='_Z13cpp_token_lenPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_token_lenPK9cpp_token'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- unsigned int -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- unsigned char* cpp_spell_token(cpp_reader*, const cpp_token*, unsigned char*, bool) -->
     <function-decl name='cpp_spell_token' mangled-name='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb' filepath='../.././libcpp/include/cpplib.h' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-238'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-41'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_get_buff(cpp_reader*, size_t) -->
     <function-decl name='_cpp_get_buff' mangled-name='_cpp_get_buff' filepath='../.././libcpp/internal.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <!-- _cpp_buff* _cpp_append_extend_buff(cpp_reader*, _cpp_buff*, size_t) -->
     <function-decl name='_cpp_append_extend_buff' mangled-name='_cpp_append_extend_buff' filepath='../.././libcpp/internal.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_append_extend_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- _cpp_buff* -->
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <!-- void _cpp_release_buff(cpp_reader*, _cpp_buff*) -->
     <function-decl name='_cpp_release_buff' mangled-name='_cpp_release_buff' filepath='../.././libcpp/internal.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_release_buff'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type '_cpp_buff*' -->
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- bool cpp_warning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning' mangled-name='_Z11cpp_warningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_warningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char*' -->
@@ -7262,52 +7260,52 @@
     <!-- const cpp_token* cpp_peek_token(cpp_reader*, int) -->
     <function-decl name='cpp_peek_token' mangled-name='_Z14cpp_peek_tokenP10cpp_readeri' filepath='../.././libcpp/include/cpplib.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_peek_tokenP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-292'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <!-- const cpp_token* _cpp_lex_token(cpp_reader*) -->
     <function-decl name='_cpp_lex_token' mangled-name='_cpp_lex_token' filepath='../.././libcpp/internal.h' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_token'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
       <!-- const cpp_token* -->
-      <return type-id='type-id-292'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <!-- bool _cpp_read_logical_line_trad(cpp_reader*) -->
     <function-decl name='_cpp_read_logical_line_trad' mangled-name='_cpp_read_logical_line_trad' filepath='../.././libcpp/internal.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_logical_line_trad'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- int _cpp_equiv_tokens(const cpp_token*, const cpp_token*) -->
     <function-decl name='_cpp_equiv_tokens' mangled-name='_cpp_equiv_tokens' filepath='../.././libcpp/internal.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_equiv_tokens'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- const cpp_macro -->
-    <qualified-type-def type-id='type-id-150' const='yes' id='type-id-373'/>
+    <qualified-type-def type-id='type-id-152' const='yes' id='type-id-372'/>
     <!-- const cpp_macro* -->
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-374'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-373'/>
     <!-- bool _cpp_expansions_different_trad(const cpp_macro*, const cpp_macro*) -->
     <function-decl name='_cpp_expansions_different_trad' mangled-name='_cpp_expansions_different_trad' filepath='../.././libcpp/internal.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expansions_different_trad'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-373'/>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-373'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- bool cpp_pedwarning_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_pedwarning_with_line' mangled-name='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7323,7 +7321,7 @@
     <!-- bool cpp_error_with_line(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_error_with_line' mangled-name='_Z19cpp_error_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_error_with_lineP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7339,7 +7337,7 @@
     <!-- bool cpp_pedwarning(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_pedwarning' mangled-name='_Z14cpp_pedwarningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_pedwarningP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char*' -->
@@ -7351,50 +7349,50 @@
     <!-- bool _cpp_create_trad_definition(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_create_trad_definition' mangled-name='_cpp_create_trad_definition' filepath='../.././libcpp/internal.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_trad_definition'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-145'/>
+      <parameter type-id='type-id-147'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- unsigned char* _cpp_aligned_alloc(cpp_reader*, size_t) -->
     <function-decl name='_cpp_aligned_alloc' mangled-name='_cpp_aligned_alloc' filepath='../.././libcpp/internal.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_aligned_alloc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- size_t _cpp_replacement_text_len(const cpp_macro*) -->
     <function-decl name='_cpp_replacement_text_len' mangled-name='_cpp_replacement_text_len' filepath='../.././libcpp/internal.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_replacement_text_len'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-373'/>
       <!-- typedef size_t -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- unsigned char* _cpp_copy_replacement_text(const cpp_macro*, unsigned char*) -->
     <function-decl name='_cpp_copy_replacement_text' filepath='../.././libcpp/internal.h' line='696' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-373'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-238'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- bool (cpp_reader*, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-339'>
+    <function-type size-in-bits='64' id='type-id-338'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-type>
     <!-- bool (cpp_reader*, int, int, source_location, unsigned int, const char*, va_list*) -->
-    <function-type size-in-bits='64' id='type-id-337'>
+    <function-type size-in-bits='64' id='type-id-336'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'int' -->
@@ -7411,51 +7409,51 @@
       <return type-id='type-id-41'/>
     </function-type>
     <!-- bool (iconv_t, const unsigned char*, size_t, _cpp_strbuf*) -->
-    <function-type size-in-bits='64' id='type-id-280'>
+    <function-type size-in-bits='64' id='type-id-279'>
       <!-- parameter of type 'typedef iconv_t' -->
-      <parameter type-id='type-id-216'/>
+      <parameter type-id='type-id-218'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type '_cpp_strbuf*' -->
-      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-278'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-type>
     <!-- char* (const char*, cpp_dir*) -->
-    <function-type size-in-bits='64' id='type-id-276'>
+    <function-type size-in-bits='64' id='type-id-275'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-246'/>
+      <parameter type-id='type-id-245'/>
       <!-- char* -->
       <return type-id='type-id-9'/>
     </function-type>
     <!-- const char* (cpp_reader*, const char*, cpp_dir**) -->
-    <function-type size-in-bits='64' id='type-id-334'>
+    <function-type size-in-bits='64' id='type-id-333'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'cpp_dir**' -->
-      <parameter type-id='type-id-333'/>
+      <parameter type-id='type-id-332'/>
       <!-- const char* -->
       <return type-id='type-id-8'/>
     </function-type>
     <!-- cpp_hashnode* (cpp_reader*, const cpp_token*) -->
-    <function-type size-in-bits='64' id='type-id-336'>
+    <function-type size-in-bits='64' id='type-id-335'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- cpp_hashnode* -->
       <return type-id='type-id-133'/>
     </function-type>
     <!-- int (cpp_reader*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-330'>
+    <function-type size-in-bits='64' id='type-id-329'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'int' -->
@@ -7464,32 +7462,32 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- hashnode (hash_table*) -->
-    <function-type size-in-bits='64' id='type-id-347'>
+    <function-type size-in-bits='64' id='type-id-346'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-344'/>
+      <return type-id='type-id-343'/>
     </function-type>
     <!-- void (cpp_reader*) -->
-    <function-type size-in-bits='64' id='type-id-338'>
+    <function-type size-in-bits='64' id='type-id-337'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, const char*) -->
-    <function-type size-in-bits='64' id='type-id-322'>
+    <function-type size-in-bits='64' id='type-id-321'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, const char*, int, const char*) -->
-    <function-type size-in-bits='64' id='type-id-331'>
+    <function-type size-in-bits='64' id='type-id-330'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'int' -->
@@ -7500,66 +7498,66 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, const cpp_token*, int) -->
-    <function-type size-in-bits='64' id='type-id-320'>
+    <function-type size-in-bits='64' id='type-id-319'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, const line_map*) -->
-    <function-type size-in-bits='64' id='type-id-321'>
+    <function-type size-in-bits='64' id='type-id-320'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const line_map*' -->
       <parameter type-id='type-id-78'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, source_location) -->
-    <function-type size-in-bits='64' id='type-id-329'>
+    <function-type size-in-bits='64' id='type-id-328'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const cpp_string*) -->
-    <function-type size-in-bits='64' id='type-id-328'>
+    <function-type size-in-bits='64' id='type-id-327'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-327'/>
+      <parameter type-id='type-id-326'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, const unsigned char*, const char*, int, const cpp_token**) -->
-    <function-type size-in-bits='64' id='type-id-323'>
+    <function-type size-in-bits='64' id='type-id-322'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const cpp_token**' -->
-      <parameter type-id='type-id-293'/>
+      <parameter type-id='type-id-292'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-type>
     <!-- void (cpp_reader*, source_location, cpp_hashnode*) -->
-    <function-type size-in-bits='64' id='type-id-324'>
+    <function-type size-in-bits='64' id='type-id-323'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef source_location' -->
       <parameter type-id='type-id-106'/>
       <!-- parameter of type 'cpp_hashnode*' -->
@@ -7568,16 +7566,16 @@
       <return type-id='type-id-1'/>
     </function-type>
     <!-- typedef cpp_num cpp_num -->
-    <typedef-decl name='cpp_num' type-id='type-id-375' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-349'/>
+    <typedef-decl name='cpp_num' type-id='type-id-374' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-348'/>
     <!-- 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-375'>
+    <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-374'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_num_part cpp_num::high -->
-        <var-decl name='high' type-id='type-id-376' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-375' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- cpp_num_part cpp_num::low -->
-        <var-decl name='low' type-id='type-id-376' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-375' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- bool cpp_num::unsignedp -->
@@ -7589,15 +7587,15 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned long int cpp_num_part -->
-    <typedef-decl name='cpp_num_part' type-id='type-id-4' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-376'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-4' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-375'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.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'>
     <!-- void _cpp_overlay_buffer(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-270' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-269' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <!-- void -->
@@ -7606,30 +7604,30 @@
     <!-- void _cpp_remove_overlay(cpp_reader*) -->
     <function-decl name='_cpp_remove_overlay' mangled-name='_cpp_remove_overlay' filepath='../.././libcpp/traditional.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remove_overlay'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- bool _cpp_scan_out_logical_line(cpp_reader*, cpp_macro*) -->
     <function-decl name='_cpp_scan_out_logical_line' mangled-name='_cpp_scan_out_logical_line' filepath='../.././libcpp/traditional.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_scan_out_logical_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'cpp_macro*' -->
-      <parameter type-id='type-id-145'/>
+      <parameter type-id='type-id-147'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- uchar* _cpp_copy_replacement_text(const cpp_macro*, uchar*) -->
     <function-decl name='_cpp_copy_replacement_text' mangled-name='_cpp_copy_replacement_text' filepath='../.././libcpp/traditional.c' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_copy_replacement_text'>
       <!-- parameter of type 'const cpp_macro*' -->
-      <parameter type-id='type-id-374' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-373' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-362' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-361' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-362'/>
+      <return type-id='type-id-361'/>
     </function-decl>
     <!-- enum ht_lookup_option -->
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-377'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-376'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
@@ -7637,24 +7635,24 @@
     <!-- hashnode ht_lookup(hash_table*, const unsigned char*, size_t, ht_lookup_option) -->
     <function-decl name='ht_lookup' mangled-name='_Z9ht_lookupP2htPKhm16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_lookupP2htPKhm16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-377'/>
+      <parameter type-id='type-id-376'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-344'/>
+      <return type-id='type-id-343'/>
     </function-decl>
     <!-- void _cpp_push_text_context(cpp_reader*, cpp_hashnode*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_push_text_context' filepath='../.././libcpp/internal.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- void -->
@@ -7663,23 +7661,23 @@
     <!-- const unsigned char* _cpp_builtin_macro_text(cpp_reader*, cpp_hashnode*) -->
     <function-decl name='_cpp_builtin_macro_text' filepath='../.././libcpp/internal.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <!-- const unsigned char* -->
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-146'/>
     </function-decl>
     <!-- bool _cpp_skip_block_comment(cpp_reader*) -->
     <function-decl name='_cpp_skip_block_comment' mangled-name='_cpp_skip_block_comment' filepath='../.././libcpp/internal.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_skip_block_comment'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- int _cpp_handle_directive(cpp_reader*, int) -->
     <function-decl name='_cpp_handle_directive' mangled-name='_cpp_handle_directive' filepath='../.././libcpp/internal.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_handle_directive'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -7688,7 +7686,7 @@
     <!-- void _cpp_process_line_notes(cpp_reader*, int) -->
     <function-decl name='_cpp_process_line_notes' mangled-name='_cpp_process_line_notes' filepath='../.././libcpp/internal.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_process_line_notes'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- void -->
@@ -7697,7 +7695,7 @@
     <!-- bool _cpp_get_fresh_line(cpp_reader*) -->
     <function-decl name='_cpp_get_fresh_line' mangled-name='_cpp_get_fresh_line' filepath='../.././libcpp/internal.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_fresh_line'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
@@ -7706,14 +7704,14 @@
     <!-- void cpp_undef_all(cpp_reader*) -->
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void _cpp_do_file_change(cpp_reader*, lc_reason, const char*, linenum_type, unsigned int) -->
     <function-decl name='_cpp_do_file_change' mangled-name='_cpp_do_file_change' filepath='../.././libcpp/directives.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do_file_change'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-130' name='reason' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -7726,17 +7724,17 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- typedef void (cpp_reader*)* pragma_cb -->
-    <typedef-decl name='pragma_cb' type-id='type-id-316' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-378'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-315' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-377'/>
     <!-- void cpp_register_pragma(cpp_reader*, const char*, const char*, pragma_cb, bool) -->
     <function-decl name='cpp_register_pragma' mangled-name='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb' filepath='../.././libcpp/directives.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='space' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='name' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <!-- parameter of type 'typedef pragma_cb' -->
-      <parameter type-id='type-id-378' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
+      <parameter type-id='type-id-377' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-41' name='allow_expansion' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <!-- void -->
@@ -7745,7 +7743,7 @@
     <!-- void cpp_register_deferred_pragma(cpp_reader*, const char*, const char*, unsigned int, bool, bool) -->
     <function-decl name='cpp_register_deferred_pragma' mangled-name='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb' filepath='../.././libcpp/directives.c' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='space' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -7762,92 +7760,92 @@
     <!-- void _cpp_init_internal_pragmas(cpp_reader*) -->
     <function-decl name='_cpp_init_internal_pragmas' mangled-name='_cpp_init_internal_pragmas' filepath='../.././libcpp/directives.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_internal_pragmas'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- char** _cpp_save_pragma_names(cpp_reader*) -->
     <function-decl name='_cpp_save_pragma_names' mangled-name='_cpp_save_pragma_names' filepath='../.././libcpp/directives.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
       <!-- char** -->
       <return type-id='type-id-30'/>
     </function-decl>
     <!-- void _cpp_restore_pragma_names(cpp_reader*, char**) -->
     <function-decl name='_cpp_restore_pragma_names' mangled-name='_cpp_restore_pragma_names' filepath='../.././libcpp/directives.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_restore_pragma_names'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- parameter of type 'char**' -->
       <parameter type-id='type-id-30' name='saved' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- unsigned int* -->
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-378'/>
     <!-- int _cpp_test_assertion(cpp_reader*, unsigned int*) -->
     <function-decl name='_cpp_test_assertion' mangled-name='_cpp_test_assertion' filepath='../.././libcpp/directives.c' line='2225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_test_assertion'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-379' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-378' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- typedef cpp_options cpp_options -->
-    <typedef-decl name='cpp_options' type-id='type-id-259' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-380'/>
+    <typedef-decl name='cpp_options' type-id='type-id-258' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-379'/>
     <!-- cpp_options* -->
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-380'/>
     <!-- cpp_options* cpp_get_options(cpp_reader*) -->
     <function-decl name='cpp_get_options' mangled-name='_Z15cpp_get_optionsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_get_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
       <!-- cpp_options* -->
-      <return type-id='type-id-381'/>
+      <return type-id='type-id-380'/>
     </function-decl>
     <!-- typedef cpp_callbacks cpp_callbacks -->
-    <typedef-decl name='cpp_callbacks' type-id='type-id-256' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-382'/>
+    <typedef-decl name='cpp_callbacks' type-id='type-id-255' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-381'/>
     <!-- cpp_callbacks* -->
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-383'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-382'/>
     <!-- cpp_callbacks* cpp_get_callbacks(cpp_reader*) -->
     <function-decl name='cpp_get_callbacks' mangled-name='_Z17cpp_get_callbacksP10cpp_reader' filepath='../.././libcpp/directives.c' line='2499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_get_callbacksP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
       <!-- cpp_callbacks* -->
-      <return type-id='type-id-383'/>
+      <return type-id='type-id-382'/>
     </function-decl>
     <!-- void cpp_set_callbacks(cpp_reader*, cpp_callbacks*) -->
     <function-decl name='cpp_set_callbacks' mangled-name='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks' filepath='../.././libcpp/directives.c' line='2506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- parameter of type 'cpp_callbacks*' -->
-      <parameter type-id='type-id-383' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-382' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- deps* cpp_get_deps(cpp_reader*) -->
     <function-decl name='cpp_get_deps' mangled-name='_Z12cpp_get_depsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_depsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
       <!-- deps* -->
-      <return type-id='type-id-254'/>
+      <return type-id='type-id-253'/>
     </function-decl>
     <!-- cpp_buffer* cpp_push_buffer(cpp_reader*, const uchar*, size_t, int) -->
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/directives.c' line='2524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_push_bufferP10cpp_readerPKhmi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-270' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-269' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='from_stage3' filepath='../.././libcpp/directives.c' line='2525' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <!-- void cpp_unassert(cpp_reader*, const char*) -->
     <function-decl name='cpp_unassert' mangled-name='_Z12cpp_unassertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_unassertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -7856,7 +7854,7 @@
     <!-- void cpp_assert(cpp_reader*, const char*) -->
     <function-decl name='cpp_assert' mangled-name='_Z10cpp_assertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_assertP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -7865,7 +7863,7 @@
     <!-- void cpp_undef(cpp_reader*, const char*) -->
     <function-decl name='cpp_undef' mangled-name='_Z9cpp_undefP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_undefP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -7874,7 +7872,7 @@
     <!-- void _cpp_define_builtin(cpp_reader*, const char*) -->
     <function-decl name='_cpp_define_builtin' mangled-name='_cpp_define_builtin' filepath='../.././libcpp/directives.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_define_builtin'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -7883,7 +7881,7 @@
     <!-- void cpp_define(cpp_reader*, const char*) -->
     <function-decl name='cpp_define' mangled-name='_Z10cpp_defineP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_defineP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -7892,7 +7890,7 @@
     <!-- void cpp_define_formatted(cpp_reader*, const char*, ...) -->
     <function-decl name='cpp_define_formatted' mangled-name='_Z20cpp_define_formattedP10cpp_readerPKcz' filepath='../.././libcpp/directives.c' line='2364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_define_formattedP10cpp_readerPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='fmt' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter is-variadic='yes'/>
@@ -7902,16 +7900,16 @@
     <!-- void _cpp_init_directives(cpp_reader*) -->
     <function-decl name='_cpp_init_directives' mangled-name='_cpp_init_directives' filepath='../.././libcpp/directives.c' line='2580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_directives'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- cpp_hashnode* cpp_lookup(cpp_reader*, const unsigned char*, unsigned int) -->
     <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/include/cpplib.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35'/>
       <!-- cpp_hashnode* -->
@@ -7920,16 +7918,16 @@
     <!-- unsigned char* cpp_output_line_to_string(cpp_reader*, const unsigned char*) -->
     <function-decl name='cpp_output_line_to_string' mangled-name='_Z25cpp_output_line_to_stringP10cpp_readerPKh' filepath='../.././libcpp/include/cpplib.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_output_line_to_stringP10cpp_readerPKh'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- bool cpp_warning_with_line_syshdr(cpp_reader*, int, source_location, unsigned int, const char*, ...) -->
     <function-decl name='cpp_warning_with_line_syshdr' mangled-name='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -7945,7 +7943,7 @@
     <!-- bool _cpp_parse_expr(cpp_reader*, bool) -->
     <function-decl name='_cpp_parse_expr' mangled-name='_cpp_parse_expr' filepath='../.././libcpp/internal.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_parse_expr'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-41'/>
       <!-- bool -->
@@ -7954,9 +7952,9 @@
     <!-- void _cpp_overlay_buffer(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_overlay_buffer' filepath='../.././libcpp/internal.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- void -->
@@ -7974,7 +7972,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- enum include_type -->
-    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-384'>
+    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-383'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='IT_INCLUDE' value='0'/>
       <enumerator name='IT_INCLUDE_NEXT' value='1'/>
@@ -7984,20 +7982,20 @@
     <!-- bool _cpp_stack_include(cpp_reader*, const char*, int, include_type) -->
     <function-decl name='_cpp_stack_include' mangled-name='_cpp_stack_include' filepath='../.././libcpp/internal.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'enum include_type' -->
-      <parameter type-id='type-id-384'/>
+      <parameter type-id='type-id-383'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- int _cpp_compare_file_date(cpp_reader*, const char*, int) -->
     <function-decl name='_cpp_compare_file_date' mangled-name='_cpp_compare_file_date' filepath='../.././libcpp/internal.h' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_compare_file_date'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'int' -->
@@ -8008,7 +8006,7 @@
     <!-- cpp_hashnode* _cpp_lex_identifier(cpp_reader*, const char*) -->
     <function-decl name='_cpp_lex_identifier' mangled-name='_cpp_lex_identifier' filepath='../.././libcpp/internal.h' line='655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- cpp_hashnode* -->
@@ -8017,16 +8015,16 @@
     <!-- void _cpp_mark_file_once_only(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_mark_file_once_only' mangled-name='_cpp_mark_file_once_only' filepath='../.././libcpp/internal.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_mark_file_once_only'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void cpp_make_system_header(cpp_reader*, int, int) -->
     <function-decl name='cpp_make_system_header' mangled-name='_Z22cpp_make_system_headerP10cpp_readerii' filepath='../.././libcpp/include/cpplib.h' line='1006' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_make_system_headerP10cpp_readerii'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'int' -->
@@ -8035,41 +8033,41 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int (cpp_reader*, cpp_hashnode*, void*)* -->
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-385'/>
     <!-- typedef int (cpp_reader*, cpp_hashnode*, void*)* cpp_cb -->
-    <typedef-decl name='cpp_cb' type-id='type-id-386' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-387'/>
+    <typedef-decl name='cpp_cb' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-386'/>
     <!-- void cpp_forall_identifiers(cpp_reader*, cpp_cb, void*) -->
     <function-decl name='cpp_forall_identifiers' mangled-name='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_' filepath='../.././libcpp/include/cpplib.h' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef cpp_cb' -->
-      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-386'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- cpp_string* -->
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-387'/>
     <!-- bool cpp_interpret_string_notranslate(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-327'/>
+      <parameter type-id='type-id-326'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-388'/>
+      <parameter type-id='type-id-387'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-161'/>
+      <parameter type-id='type-id-163'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- void _cpp_fake_include(cpp_reader*, const char*) -->
     <function-decl name='_cpp_fake_include' mangled-name='_cpp_fake_include' filepath='../.././libcpp/internal.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_fake_include'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -8078,14 +8076,14 @@
     <!-- deps* deps_init() -->
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/include/mkdeps.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
       <!-- deps* -->
-      <return type-id='type-id-254'/>
+      <return type-id='type-id-253'/>
     </function-decl>
     <!-- void _cpp_pop_file_buffer(cpp_reader*, _cpp_file*) -->
     <function-decl name='_cpp_pop_file_buffer' mangled-name='_cpp_pop_file_buffer' filepath='../.././libcpp/internal.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_file_buffer'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -8099,9 +8097,9 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int (cpp_reader*, cpp_hashnode*, void*) -->
-    <function-type size-in-bits='64' id='type-id-385'>
+    <function-type size-in-bits='64' id='type-id-384'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile'/>
+      <parameter type-id='type-id-318' name='pfile'/>
       <!-- parameter of type 'cpp_hashnode*' -->
       <parameter type-id='type-id-133' name='node'/>
       <!-- parameter of type 'void*' -->
@@ -8114,7 +8112,7 @@
     <!-- bool cpp_warning_syshdr(cpp_reader*, int, const char*, ...) -->
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char*' -->
@@ -8155,135 +8153,135 @@
     <!-- 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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-161'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-161'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-161'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
       <!-- enum cpp_ttype -->
-      <return type-id='type-id-161'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- const char* cpp_get_userdef_suffix(const cpp_token*) -->
     <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'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
+      <parameter type-id='type-id-291' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
       <!-- const char* -->
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- unsigned int cpp_classify_number(cpp_reader*, const cpp_token*, const char**) -->
     <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 of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-272' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-271' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <!-- unsigned int -->
       <return type-id='type-id-35'/>
     </function-decl>
     <!-- cpp_num cpp_interpret_integer(cpp_reader*, const cpp_token*, unsigned int) -->
     <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 of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-349'/>
+      <return type-id='type-id-348'/>
     </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'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
       <!-- op* -->
-      <return type-id='type-id-258'/>
+      <return type-id='type-id-257'/>
     </function-decl>
     <!-- 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-349' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-348' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <!-- typedef cpp_num -->
-      <return type-id='type-id-349'/>
+      <return type-id='type-id-348'/>
     </function-decl>
     <!-- typedef unsigned int cppchar_t -->
-    <typedef-decl name='cppchar_t' type-id='type-id-35' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-389'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-35' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-388'/>
     <!-- cppchar_t cpp_interpret_charconst(cpp_reader*, const cpp_token*, unsigned int*, int*) -->
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/include/cpplib.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <!-- parameter of type 'unsigned int*' -->
-      <parameter type-id='type-id-379'/>
+      <parameter type-id='type-id-378'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-62'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-389'/>
+      <return type-id='type-id-388'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <!-- bool _cpp_find_failed(_cpp_file*) -->
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
+      <parameter type-id='type-id-247' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- _cpp_file* _cpp_find_file(cpp_reader*, const char*, cpp_dir*, bool, int) -->
     <function-decl name='_cpp_find_file' mangled-name='_cpp_find_file' filepath='../.././libcpp/files.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-246' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-245' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-41' name='fake' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='angle_brackets' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <!-- _cpp_file* -->
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <!-- bool _cpp_stack_file(cpp_reader*, _cpp_file*, bool) -->
     <function-decl name='_cpp_stack_file' mangled-name='_cpp_stack_file' filepath='../.././libcpp/files.c' line='796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_file'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-247' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- parameter of type 'bool' -->
       <parameter type-id='type-id-41' name='import' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <!-- bool -->
@@ -8292,7 +8290,7 @@
     <!-- bool cpp_included(cpp_reader*, const char*) -->
     <function-decl name='cpp_included' mangled-name='_Z12cpp_includedP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_includedP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -8301,7 +8299,7 @@
     <!-- bool cpp_included_before(cpp_reader*, const char*, source_location) -->
     <function-decl name='cpp_included_before' mangled-name='_Z19cpp_included_beforeP10cpp_readerPKcj' filepath='../.././libcpp/files.c' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_included_beforeP10cpp_readerPKcj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <!-- parameter of type 'typedef source_location' -->
@@ -8312,28 +8310,28 @@
     <!-- void _cpp_init_files(cpp_reader*) -->
     <function-decl name='_cpp_init_files' mangled-name='_cpp_init_files' filepath='../.././libcpp/files.c' line='1170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void _cpp_cleanup_files(cpp_reader*) -->
     <function-decl name='_cpp_cleanup_files' mangled-name='_cpp_cleanup_files' filepath='../.././libcpp/files.c' line='1187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_cleanup_files'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void cpp_clear_file_cache(cpp_reader*) -->
     <function-decl name='cpp_clear_file_cache' mangled-name='_Z20cpp_clear_file_cacheP10cpp_reader' filepath='../.././libcpp/files.c' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_clear_file_cacheP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void cpp_change_file(cpp_reader*, lc_reason, const char*) -->
     <function-decl name='cpp_change_file' mangled-name='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc' filepath='../.././libcpp/files.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'enum lc_reason' -->
       <parameter type-id='type-id-130' name='reason' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -8344,14 +8342,14 @@
     <!-- void _cpp_report_missing_guards(cpp_reader*) -->
     <function-decl name='_cpp_report_missing_guards' mangled-name='_cpp_report_missing_guards' filepath='../.././libcpp/files.c' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_report_missing_guards'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- bool cpp_push_include(cpp_reader*, const char*) -->
     <function-decl name='cpp_push_include' mangled-name='_Z16cpp_push_includeP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_push_includeP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <!-- bool -->
@@ -8360,11 +8358,11 @@
     <!-- void cpp_set_include_chains(cpp_reader*, cpp_dir*, cpp_dir*, int) -->
     <function-decl name='cpp_set_include_chains' mangled-name='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i' filepath='../.././libcpp/files.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-246' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-245' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'cpp_dir*' -->
-      <parameter type-id='type-id-246' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-245' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='quote_ignores_source_dir' filepath='../.././libcpp/files.c' line='1394' column='1'/>
       <!-- void -->
@@ -8373,28 +8371,28 @@
     <!-- const char* cpp_get_path(_cpp_file*) -->
     <function-decl name='cpp_get_path' mangled-name='_Z12cpp_get_pathP9_cpp_file' filepath='../.././libcpp/files.c' line='1603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_pathP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <!-- const char* -->
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- cpp_dir* cpp_get_dir(_cpp_file*) -->
     <function-decl name='cpp_get_dir' mangled-name='_Z11cpp_get_dirP9_cpp_file' filepath='../.././libcpp/files.c' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_get_dirP9_cpp_file'>
       <!-- parameter of type '_cpp_file*' -->
-      <parameter type-id='type-id-248' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
+      <parameter type-id='type-id-247' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
       <!-- cpp_dir* -->
-      <return type-id='type-id-246'/>
+      <return type-id='type-id-245'/>
     </function-decl>
     <!-- cpp_buffer* cpp_get_prev(cpp_buffer*) -->
     <function-decl name='cpp_get_prev' mangled-name='_Z12cpp_get_prevP10cpp_buffer' filepath='../.././libcpp/files.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_prevP10cpp_buffer'>
       <!-- parameter of type 'cpp_buffer*' -->
-      <parameter type-id='type-id-240' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
+      <parameter type-id='type-id-239' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
       <!-- cpp_buffer* -->
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <!-- bool _cpp_save_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_save_file_entries' mangled-name='_cpp_save_file_entries' filepath='../.././libcpp/files.c' line='1684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -8403,7 +8401,7 @@
     <!-- bool _cpp_read_file_entries(cpp_reader*, FILE*) -->
     <function-decl name='_cpp_read_file_entries' mangled-name='_cpp_read_file_entries' filepath='../.././libcpp/files.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_file_entries'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <!-- bool -->
@@ -8440,7 +8438,7 @@
     <!-- void deps_add_dep(deps*, const char*) -->
     <function-decl name='deps_add_dep' mangled-name='_Z12deps_add_depP4depsPKc' filepath='../.././libcpp/include/mkdeps.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_add_depP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254'/>
+      <parameter type-id='type-id-253'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -8467,9 +8465,9 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- typedef long int __ssize_t -->
-    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-390'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-389'/>
     <!-- typedef __ssize_t ssize_t -->
-    <typedef-decl name='ssize_t' type-id='type-id-390' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-391'/>
+    <typedef-decl name='ssize_t' type-id='type-id-389' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-390'/>
     <!-- ssize_t read(int, void*, size_t) -->
     <function-decl name='read' filepath='/usr/include/unistd.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -8479,48 +8477,48 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-391'/>
+      <return type-id='type-id-390'/>
     </function-decl>
     <!-- const unsigned char** -->
-    <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-391'/>
     <!-- typedef __off_t off_t -->
-    <typedef-decl name='off_t' type-id='type-id-13' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-393'/>
+    <typedef-decl name='off_t' type-id='type-id-13' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-392'/>
     <!-- off_t* -->
-    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-393'/>
     <!-- unsigned char* _cpp_convert_input(cpp_reader*, const char*, unsigned char*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' filepath='../.././libcpp/internal.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'unsigned char*' -->
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-238'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-392'/>
+      <parameter type-id='type-id-391'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-394'/>
+      <parameter type-id='type-id-393'/>
       <!-- unsigned char* -->
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <!-- struct __dirstream -->
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-395'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-394'/>
     <!-- typedef __dirstream DIR -->
-    <typedef-decl name='DIR' type-id='type-id-395' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-396'/>
+    <typedef-decl name='DIR' type-id='type-id-394' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-395'/>
     <!-- DIR* -->
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-397'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
     <!-- DIR* opendir(const char*) -->
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- DIR* -->
-      <return type-id='type-id-397'/>
+      <return type-id='type-id-396'/>
     </function-decl>
     <!-- struct dirent -->
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-398'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-397'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __ino_t dirent::d_ino -->
         <var-decl name='d_ino' type-id='type-id-45' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
@@ -8539,45 +8537,45 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
         <!-- char dirent::d_name[256] -->
-        <var-decl name='d_name' type-id='type-id-399' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
+        <var-decl name='d_name' type-id='type-id-398' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
 
     <!-- char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-399'>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-398'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-22' id='type-id-400'/>
+      <subrange length='256' type-id='type-id-22' id='type-id-399'/>
 
     </array-type-def>
     <!-- dirent* -->
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-401'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-400'/>
     <!-- dirent* readdir(DIR*) -->
     <function-decl name='readdir' filepath='/usr/include/dirent.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-397'/>
+      <parameter type-id='type-id-396'/>
       <!-- dirent* -->
-      <return type-id='type-id-401'/>
+      <return type-id='type-id-400'/>
     </function-decl>
     <!-- int closedir(DIR*) -->
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'DIR*' -->
-      <parameter type-id='type-id-397'/>
+      <parameter type-id='type-id-396'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- void* htab_find_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_find_with_hash' filepath='../.././libcpp/../include/hashtab.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-175'/>
       <!-- void* -->
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- typedef int (void*, void*)* __compar_fn_t -->
-    <typedef-decl name='__compar_fn_t' type-id='type-id-185' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-402'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-187' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-401'/>
     <!-- void* bsearch(void*, void*, size_t, size_t, __compar_fn_t) -->
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -8589,7 +8587,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-402'/>
+      <parameter type-id='type-id-401'/>
       <!-- void* -->
       <return type-id='type-id-2'/>
     </function-decl>
@@ -8598,22 +8596,22 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-177'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-176'/>
+      <parameter type-id='type-id-178'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-177'/>
+      <parameter type-id='type-id-179'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-178'/>
+      <parameter type-id='type-id-180'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-179'/>
+      <parameter type-id='type-id-181'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-193'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- void htab_delete(htab_t) -->
     <function-decl name='htab_delete' filepath='../.././libcpp/../include/hashtab.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -8626,27 +8624,27 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'typedef __compar_fn_t' -->
-      <parameter type-id='type-id-402'/>
+      <parameter type-id='type-id-401'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- size_t htab_elements(htab_t) -->
     <function-decl name='htab_elements' filepath='../.././libcpp/../include/hashtab.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <!-- typedef size_t -->
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int (void**, void*)* -->
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-404'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
     <!-- typedef int (void**, void*)* htab_trav -->
-    <typedef-decl name='htab_trav' type-id='type-id-404' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-405'/>
+    <typedef-decl name='htab_trav' type-id='type-id-403' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-404'/>
     <!-- void htab_traverse(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse' filepath='../.././libcpp/../include/hashtab.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-405'/>
+      <parameter type-id='type-id-404'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
@@ -8684,7 +8682,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <!-- int (void**, void*) -->
-    <function-type size-in-bits='64' id='type-id-403'>
+    <function-type size-in-bits='64' id='type-id-402'>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-102'/>
       <!-- parameter of type 'void*' -->
@@ -8697,25 +8695,25 @@
     <!-- void _cpp_destroy_hashtable(cpp_reader*) -->
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void _cpp_init_hashtable(cpp_reader*, hash_table*) -->
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-345' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int cpp_defined(cpp_reader*, const unsigned char*, int) -->
     <function-decl name='cpp_defined' mangled-name='_Z11cpp_definedP10cpp_readerPKhi' filepath='../.././libcpp/identifiers.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_definedP10cpp_readerPKhi'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-146' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='len' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <!-- int -->
@@ -8724,7 +8722,7 @@
     <!-- void ht_destroy(hash_table*) -->
     <function-decl name='ht_destroy' mangled-name='_Z10ht_destroyP2ht' filepath='../.././libcpp/include/symtab.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10ht_destroyP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -8733,29 +8731,29 @@
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35'/>
       <!-- hash_table* -->
-      <return type-id='type-id-346'/>
+      <return type-id='type-id-345'/>
     </function-decl>
     <!-- int (cpp_reader*, typedef hashnode, void*)* -->
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-406'/>
     <!-- typedef int (cpp_reader*, typedef hashnode, void*)* ht_cb -->
-    <typedef-decl name='ht_cb' type-id='type-id-407' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-408'/>
+    <typedef-decl name='ht_cb' type-id='type-id-406' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-407'/>
     <!-- void ht_forall(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_forall' mangled-name='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/include/symtab.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-408'/>
+      <parameter type-id='type-id-407'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- int (cpp_reader*, hashnode, void*) -->
-    <function-type size-in-bits='64' id='type-id-406'>
+    <function-type size-in-bits='64' id='type-id-405'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'typedef hashnode' -->
-      <parameter type-id='type-id-344'/>
+      <parameter type-id='type-id-343'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- int -->
@@ -8766,7 +8764,7 @@
     <!-- int cpp_ideq(const cpp_token*, const char*) -->
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <!-- int -->
@@ -8778,10 +8776,10 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- struct {cpp_comment* entries; int count; int allocated;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-409'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-408'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cpp_comment* entries -->
-        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-355' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int count -->
@@ -8793,7 +8791,7 @@
       </data-member>
     </class-decl>
     <!-- struct {char* comment; source_location sloc;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-410'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-409'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- char* comment -->
         <var-decl name='comment' type-id='type-id-9' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
@@ -8804,36 +8802,36 @@
       </data-member>
     </class-decl>
     <!-- cpp_comment_table* -->
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-410'/>
     <!-- cpp_comment_table* cpp_get_comments(cpp_reader*) -->
     <function-decl name='cpp_get_comments' mangled-name='_Z16cpp_get_commentsP10cpp_reader' filepath='../.././libcpp/lex.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_get_commentsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
       <!-- cpp_comment_table* -->
-      <return type-id='type-id-411'/>
+      <return type-id='type-id-410'/>
     </function-decl>
     <!-- void _cpp_init_tokenrun(tokenrun*, unsigned int) -->
     <function-decl name='_cpp_init_tokenrun' mangled-name='_cpp_init_tokenrun' filepath='../.././libcpp/lex.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_tokenrun'>
       <!-- parameter of type 'tokenrun*' -->
-      <parameter type-id='type-id-252' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
+      <parameter type-id='type-id-251' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- typedef cpp_context cpp_context -->
-    <typedef-decl name='cpp_context' type-id='type-id-243' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-412'/>
+    <typedef-decl name='cpp_context' type-id='type-id-242' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-411'/>
     <!-- int _cpp_remaining_tokens_num_in_context(cpp_context*) -->
     <function-decl name='_cpp_remaining_tokens_num_in_context' mangled-name='_cpp_remaining_tokens_num_in_context' filepath='../.././libcpp/lex.c' line='1745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remaining_tokens_num_in_context'>
       <!-- parameter of type 'cpp_context*' -->
-      <parameter type-id='type-id-244' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
+      <parameter type-id='type-id-243' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- 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-161' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- parameter of type 'unsigned char' -->
       <parameter type-id='type-id-132' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <!-- const char* -->
@@ -8842,7 +8840,7 @@
     <!-- void cpp_output_token(const cpp_token*, FILE*) -->
     <function-decl name='cpp_output_token' mangled-name='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE'>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <!-- void -->
@@ -8851,25 +8849,25 @@
     <!-- int cpp_avoid_paste(cpp_reader*, const cpp_token*, const cpp_token*) -->
     <function-decl name='cpp_avoid_paste' mangled-name='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_' filepath='../.././libcpp/lex.c' line='2592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-291' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
       <!-- parameter of type 'const cpp_token*' -->
-      <parameter type-id='type-id-292' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
+      <parameter type-id='type-id-291' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- void cpp_output_line(cpp_reader*, FILE*) -->
     <function-decl name='cpp_output_line' mangled-name='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- enum cpp_token_fld_kind -->
-    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-413'>
+    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-412'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='CPP_TOKEN_FLD_NODE' value='0'/>
       <enumerator name='CPP_TOKEN_FLD_SOURCE' value='1'/>
@@ -8882,14 +8880,14 @@
     <!-- 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-155' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <parameter type-id='type-id-157' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
       <!-- enum cpp_token_fld_kind -->
-      <return type-id='type-id-413'/>
+      <return type-id='type-id-412'/>
     </function-decl>
     <!-- void cpp_force_token_locations(cpp_reader*, source_location*) -->
     <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'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
+      <parameter type-id='type-id-318' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- parameter of type 'source_location*' -->
       <parameter type-id='type-id-134' name='p' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <!-- void -->
@@ -8898,15 +8896,15 @@
     <!-- void cpp_stop_forcing_token_locations(cpp_reader*) -->
     <function-decl name='cpp_stop_forcing_token_locations' mangled-name='_Z32cpp_stop_forcing_token_locationsP10cpp_reader' filepath='../.././libcpp/lex.c' line='2918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_stop_forcing_token_locationsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- 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-414'>
+    <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-413'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- cppchar_t normalize_state::previous -->
-        <var-decl name='previous' type-id='type-id-389' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-388' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- unsigned char normalize_state::prev_class -->
@@ -8914,32 +8912,32 @@
       </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-353' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-352' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
     <!-- normalize_state* -->
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-414'/>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const unsigned char**, const unsigned char*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' filepath='../.././libcpp/internal.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-392'/>
+      <parameter type-id='type-id-391'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-415'/>
+      <parameter type-id='type-id-414'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-389'/>
+      <return type-id='type-id-388'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const unsigned char*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' filepath='../.././libcpp/internal.h' line='731' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- cpp_hashnode* -->
@@ -8948,17 +8946,17 @@
     <!-- hashnode ht_lookup_with_hash(hash_table*, const unsigned char*, size_t, unsigned int, ht_lookup_option) -->
     <function-decl name='ht_lookup_with_hash' mangled-name='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- parameter of type 'const unsigned char*' -->
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35'/>
       <!-- parameter of type 'enum ht_lookup_option' -->
-      <parameter type-id='type-id-377'/>
+      <parameter type-id='type-id-376'/>
       <!-- typedef hashnode -->
-      <return type-id='type-id-344'/>
+      <return type-id='type-id-343'/>
     </function-decl>
     <!-- void* memmove(void*, void*, size_t) -->
     <function-decl name='memmove' filepath='/usr/include/string.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8974,7 +8972,7 @@
     <!-- 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-161'/>
+      <parameter type-id='type-id-163'/>
       <!-- const char* -->
       <return type-id='type-id-8'/>
     </function-decl>
@@ -8983,14 +8981,14 @@
     <!-- void deps_free(deps*) -->
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
+      <parameter type-id='type-id-253' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void deps_add_target(deps*, const char*, int) -->
     <function-decl name='deps_add_target' mangled-name='_Z15deps_add_targetP4depsPKci' filepath='../.././libcpp/mkdeps.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15deps_add_targetP4depsPKci'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
+      <parameter type-id='type-id-253' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='t' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9001,7 +8999,7 @@
     <!-- void deps_add_default_target(deps*, const char*) -->
     <function-decl name='deps_add_default_target' mangled-name='_Z23deps_add_default_targetP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23deps_add_default_targetP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254'/>
+      <parameter type-id='type-id-253'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
@@ -9010,20 +9008,20 @@
     <!-- void deps_add_vpath(deps*, const char*) -->
     <function-decl name='deps_add_vpath' mangled-name='_Z14deps_add_vpathP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14deps_add_vpathP4depsPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254'/>
+      <parameter type-id='type-id-253'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const deps -->
-    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-416'/>
+    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-415'/>
     <!-- const deps* -->
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-416'/>
     <!-- void deps_write(const deps*, FILE*, unsigned int) -->
     <function-decl name='deps_write' mangled-name='_Z10deps_writePK4depsP8_IO_FILEj' filepath='../.././libcpp/mkdeps.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10deps_writePK4depsP8_IO_FILEj'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-417' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
+      <parameter type-id='type-id-416' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9034,7 +9032,7 @@
     <!-- void deps_phony_targets(const deps*, FILE*) -->
     <function-decl name='deps_phony_targets' mangled-name='_Z18deps_phony_targetsPK4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18deps_phony_targetsPK4depsP8_IO_FILE'>
       <!-- parameter of type 'const deps*' -->
-      <parameter type-id='type-id-417' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
+      <parameter type-id='type-id-416' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <!-- void -->
@@ -9043,7 +9041,7 @@
     <!-- int deps_save(deps*, FILE*) -->
     <function-decl name='deps_save' mangled-name='_Z9deps_saveP4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_saveP4depsP8_IO_FILE'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
+      <parameter type-id='type-id-253' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='f' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <!-- int -->
@@ -9052,7 +9050,7 @@
     <!-- int deps_restore(deps*, FILE*, const char*) -->
     <function-decl name='deps_restore' mangled-name='_Z12deps_restoreP4depsP8_IO_FILEPKc' filepath='../.././libcpp/mkdeps.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_restoreP4depsP8_IO_FILEPKc'>
       <!-- parameter of type 'deps*' -->
-      <parameter type-id='type-id-254' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
+      <parameter type-id='type-id-253' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fd' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <!-- parameter of type 'const char*' -->
@@ -9065,9 +9063,9 @@
     <!-- void ht_purge(hash_table*, ht_cb, void*) -->
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- parameter of type 'typedef ht_cb' -->
-      <parameter type-id='type-id-408'/>
+      <parameter type-id='type-id-407'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2'/>
       <!-- void -->
@@ -9076,9 +9074,9 @@
     <!-- void ht_load(hash_table*, hashnode*, unsigned int, unsigned int, bool) -->
     <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 of type 'hash_table*' -->
-      <parameter type-id='type-id-346' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-345' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'hashnode*' -->
-      <parameter type-id='type-id-341' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-340' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <!-- parameter of type 'unsigned int' -->
       <parameter type-id='type-id-35' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <!-- parameter of type 'unsigned int' -->
@@ -9091,7 +9089,7 @@
     <!-- void ht_dump_statistics(hash_table*) -->
     <function-decl name='ht_dump_statistics' mangled-name='_Z18ht_dump_statisticsP2ht' filepath='../.././libcpp/symtab.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18ht_dump_statisticsP2ht'>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -9107,64 +9105,64 @@
     <!-- void cpp_init_iconv(cpp_reader*) -->
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void _cpp_destroy_iconv(cpp_reader*) -->
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- cppchar_t cpp_host_to_exec_charset(cpp_reader*, cppchar_t) -->
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- parameter of type 'typedef cppchar_t' -->
-      <parameter type-id='type-id-389' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-388' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-389'/>
+      <return type-id='type-id-388'/>
     </function-decl>
     <!-- const uchar** -->
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-417'/>
     <!-- cppchar_t _cpp_valid_ucn(cpp_reader*, const uchar**, const uchar*, int, normalize_state*) -->
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar**' -->
-      <parameter type-id='type-id-418' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-417' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-270' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-269' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <!-- parameter of type 'normalize_state*' -->
-      <parameter type-id='type-id-415' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <parameter type-id='type-id-414' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
       <!-- typedef cppchar_t -->
-      <return type-id='type-id-389'/>
+      <return type-id='type-id-388'/>
     </function-decl>
     <!-- bool cpp_interpret_string(cpp_reader*, const cpp_string*, size_t, cpp_string*, cpp_ttype) -->
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'const cpp_string*' -->
-      <parameter type-id='type-id-327'/>
+      <parameter type-id='type-id-326'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- parameter of type 'cpp_string*' -->
-      <parameter type-id='type-id-388'/>
+      <parameter type-id='type-id-387'/>
       <!-- parameter of type 'enum cpp_ttype' -->
-      <parameter type-id='type-id-161'/>
+      <parameter type-id='type-id-163'/>
       <!-- bool -->
       <return type-id='type-id-41'/>
     </function-decl>
     <!-- cpp_hashnode* _cpp_interpret_identifier(cpp_reader*, const uchar*, size_t) -->
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'const uchar*' -->
-      <parameter type-id='type-id-270' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-269' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <!-- cpp_hashnode* -->
@@ -9173,21 +9171,21 @@
     <!-- uchar* _cpp_convert_input(cpp_reader*, const char*, uchar*, size_t, size_t, const unsigned char**, off_t*) -->
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <!-- parameter of type 'uchar*' -->
-      <parameter type-id='type-id-362' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-361' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <!-- parameter of type 'const unsigned char**' -->
-      <parameter type-id='type-id-392' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-391' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- parameter of type 'off_t*' -->
-      <parameter type-id='type-id-394' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-393' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
       <!-- uchar* -->
-      <return type-id='type-id-362'/>
+      <return type-id='type-id-361'/>
     </function-decl>
     <!-- const char* _cpp_default_encoding() -->
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
@@ -9199,50 +9197,50 @@
     <!-- void cpp_set_lang(cpp_reader*, c_lang) -->
     <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 of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- parameter of type 'enum c_lang' -->
-      <parameter type-id='type-id-352' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-351' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </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-352' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-351' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'hash_table*' -->
-      <parameter type-id='type-id-346' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-345' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
+      <parameter type-id='type-id-208' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
       <!-- cpp_reader* -->
-      <return type-id='type-id-319'/>
+      <return type-id='type-id-318'/>
     </function-decl>
     <!-- void cpp_set_line_map(cpp_reader*, line_maps*) -->
     <function-decl name='cpp_set_line_map' mangled-name='_Z16cpp_set_line_mapP10cpp_readerP9line_maps' filepath='../.././libcpp/init.c' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_set_line_mapP10cpp_readerP9line_maps'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- parameter of type 'line_maps*' -->
-      <parameter type-id='type-id-206' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-208' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void cpp_destroy(cpp_reader*) -->
     <function-decl name='cpp_destroy' mangled-name='_Z11cpp_destroyP10cpp_reader' filepath='../.././libcpp/init.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_destroyP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void cpp_init_special_builtins(cpp_reader*) -->
     <function-decl name='cpp_init_special_builtins' mangled-name='_Z25cpp_init_special_builtinsP10cpp_reader' filepath='../.././libcpp/init.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_init_special_builtinsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void cpp_init_builtins(cpp_reader*, int) -->
     <function-decl name='cpp_init_builtins' mangled-name='_Z17cpp_init_builtinsP10cpp_readeri' filepath='../.././libcpp/init.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_init_builtinsP10cpp_readeri'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- void -->
@@ -9251,14 +9249,14 @@
     <!-- void cpp_post_options(cpp_reader*) -->
     <function-decl name='cpp_post_options' mangled-name='_Z16cpp_post_optionsP10cpp_reader' filepath='../.././libcpp/init.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_post_optionsP10cpp_reader'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const char* cpp_read_main_file(cpp_reader*, const char*) -->
     <function-decl name='cpp_read_main_file' mangled-name='_Z18cpp_read_main_fileP10cpp_readerPKc' filepath='../.././libcpp/init.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_read_main_fileP10cpp_readerPKc'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <!-- const char* -->
@@ -9267,21 +9265,21 @@
     <!-- void cpp_finish(cpp_reader*, FILE*) -->
     <function-decl name='cpp_finish' mangled-name='_Z10cpp_finishP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/init.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_finishP10cpp_readerP8_IO_FILE'>
       <!-- parameter of type 'cpp_reader*' -->
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- parameter of type 'FILE*' -->
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
 
-    <!-- unsigned char[256] -->
-    <array-type-def dimensions='1' type-id='type-id-132' size-in-bits='2048' id='type-id-419'>
+    <!-- const unsigned char[256] -->
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='2048' id='type-id-418'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-22' id='type-id-400'/>
+      <subrange length='256' type-id='type-id-22' id='type-id-399'/>
 
     </array-type-def>
-    <!-- unsigned char _cpp_trigraph_map[256] -->
-    <var-decl name='_cpp_trigraph_map' type-id='type-id-419' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
+    <!-- const unsigned char _cpp_trigraph_map[256] -->
+    <var-decl name='_cpp_trigraph_map' type-id='type-id-418' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void set_cplus_marker_for_demangling(int) -->
@@ -9301,7 +9299,7 @@
       <return type-id='type-id-8'/>
     </function-decl>
     <!-- enum demangling_styles -->
-    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-420'>
+    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-419'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='no_demangling' value='-1'/>
       <enumerator name='unknown_demangling' value='0'/>
@@ -9318,16 +9316,16 @@
     <!-- demangling_styles cplus_demangle_set_style(demangling_styles) -->
     <function-decl name='cplus_demangle_set_style' mangled-name='cplus_demangle_set_style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_set_style'>
       <!-- parameter of type 'enum demangling_styles' -->
-      <parameter type-id='type-id-420' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
+      <parameter type-id='type-id-419' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-420'/>
+      <return type-id='type-id-419'/>
     </function-decl>
     <!-- demangling_styles cplus_demangle_name_to_style(const char*) -->
     <function-decl name='cplus_demangle_name_to_style' mangled-name='cplus_demangle_name_to_style' filepath='../.././libiberty/cplus-dem.c' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_name_to_style'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/cplus-dem.c' line='802' column='1'/>
       <!-- enum demangling_styles -->
-      <return type-id='type-id-420'/>
+      <return type-id='type-id-419'/>
     </function-decl>
     <!-- char* ada_demangle(const char*, int) -->
     <function-decl name='ada_demangle' mangled-name='ada_demangle' filepath='../.././libiberty/cplus-dem.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ada_demangle'>
@@ -9350,37 +9348,37 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- demangling_styles current_demangling_style -->
-    <var-decl name='current_demangling_style' type-id='type-id-420' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
+    <var-decl name='current_demangling_style' type-id='type-id-419' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
     <!-- struct demangler_engine -->
-    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-421'>
+    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-420'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* const demangler_engine::demangling_style_name -->
-        <var-decl name='demangling_style_name' type-id='type-id-422' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
+        <var-decl name='demangling_style_name' type-id='type-id-421' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- const demangling_styles demangler_engine::demangling_style -->
-        <var-decl name='demangling_style' type-id='type-id-423' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
+        <var-decl name='demangling_style' type-id='type-id-422' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- const char* const demangler_engine::demangling_style_doc -->
-        <var-decl name='demangling_style_doc' type-id='type-id-422' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
+        <var-decl name='demangling_style_doc' type-id='type-id-421' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
       </data-member>
     </class-decl>
     <!-- const char* const -->
-    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-422'/>
+    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-421'/>
     <!-- const demangling_styles -->
-    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-423'/>
+    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-422'/>
 
-    <!-- demangler_engine[11] -->
-    <array-type-def dimensions='1' type-id='type-id-421' size-in-bits='2112' id='type-id-424'>
+    <!-- const demangler_engine[11] -->
+    <array-type-def dimensions='1' type-id='type-id-423' size-in-bits='2112' id='type-id-424'>
       <!-- <anonymous range>[11] -->
       <subrange length='11' type-id='type-id-22' id='type-id-425'/>
 
     </array-type-def>
-    <!-- demangler_engine[11] const -->
-    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-426'/>
-    <!-- demangler_engine[11] const libiberty_demanglers -->
-    <var-decl name='libiberty_demanglers' type-id='type-id-426' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
+    <!-- const demangler_engine -->
+    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-423'/>
+    <!-- const demangler_engine libiberty_demanglers[11] -->
+    <var-decl name='libiberty_demanglers' type-id='type-id-424' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
     <!-- int __builtin_strcmp(const char*, const char*) -->
     <function-decl name='__builtin_strcmp' mangled-name='strcmp' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'const char*' -->
@@ -9493,18 +9491,18 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- struct demangle_component -->
-    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-427'>
+    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-426'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component_type demangle_component::type -->
-        <var-decl name='type' type-id='type-id-428' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
+        <var-decl name='type' type-id='type-id-427' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} demangle_component::u -->
-        <var-decl name='u' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
+        <var-decl name='u' type-id='type-id-428' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum demangle_component_type -->
-    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-428'>
+    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-427'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='DEMANGLE_COMPONENT_NAME' value='0'/>
       <enumerator name='DEMANGLE_COMPONENT_QUAL_NAME' value='1'/>
@@ -9579,58 +9577,58 @@
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='70'/>
     </enum-decl>
     <!-- union {struct {const char* s; int len;} s_name; struct {const demangle_operator_info* op;} s_operator; struct {int args; demangle_component* name;} s_extended_operator; struct {demangle_component* length; short int accum; short int sat;} s_fixed; struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor; struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor; struct {const demangle_builtin_type_info* type;} s_builtin; struct {const char* string; int len;} s_string; struct {long int number;} s_number; struct {int character;} s_character; struct {demangle_component* left; demangle_component* right;} s_binary; struct {demangle_component* sub; int num;} s_unary_num;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-429'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-428'>
       <data-member access='private'>
         <!-- struct {const char* s; int len;} s_name -->
-        <var-decl name='s_name' type-id='type-id-430' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
+        <var-decl name='s_name' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_operator_info* op;} s_operator -->
-        <var-decl name='s_operator' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
+        <var-decl name='s_operator' type-id='type-id-430' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int args; demangle_component* name;} s_extended_operator -->
-        <var-decl name='s_extended_operator' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
+        <var-decl name='s_extended_operator' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* length; short int accum; short int sat;} s_fixed -->
-        <var-decl name='s_fixed' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
+        <var-decl name='s_fixed' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} s_ctor -->
-        <var-decl name='s_ctor' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
+        <var-decl name='s_ctor' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} s_dtor -->
-        <var-decl name='s_dtor' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
+        <var-decl name='s_dtor' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const demangle_builtin_type_info* type;} s_builtin -->
-        <var-decl name='s_builtin' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
+        <var-decl name='s_builtin' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {const char* string; int len;} s_string -->
-        <var-decl name='s_string' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
+        <var-decl name='s_string' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {long int number;} s_number -->
-        <var-decl name='s_number' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
+        <var-decl name='s_number' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {int character;} s_character -->
-        <var-decl name='s_character' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
+        <var-decl name='s_character' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* left; demangle_component* right;} s_binary -->
-        <var-decl name='s_binary' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
+        <var-decl name='s_binary' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {demangle_component* sub; int num;} s_unary_num -->
-        <var-decl name='s_unary_num' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
+        <var-decl name='s_unary_num' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {const char* s; int len;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-430'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-429'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* s -->
         <var-decl name='s' type-id='type-id-8' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='446' column='1'/>
@@ -9641,14 +9639,14 @@
       </data-member>
     </class-decl>
     <!-- struct {const demangle_operator_info* op;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-431'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-430'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_operator_info* op -->
-        <var-decl name='op' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
+        <var-decl name='op' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_operator_info -->
-    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-443'>
+    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-442'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_operator_info::code -->
         <var-decl name='code' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='40' column='1'/>
@@ -9667,52 +9665,52 @@
       </data-member>
     </class-decl>
     <!-- const demangle_operator_info -->
-    <qualified-type-def type-id='type-id-443' const='yes' id='type-id-444'/>
+    <qualified-type-def type-id='type-id-442' const='yes' id='type-id-443'/>
     <!-- const demangle_operator_info* -->
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-442'/>
+    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-441'/>
     <!-- struct {int args; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-432'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-431'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int args -->
         <var-decl name='args' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
+        <var-decl name='name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
       </data-member>
     </class-decl>
     <!-- demangle_component* -->
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-445'/>
+    <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-444'/>
     <!-- struct {demangle_component* length; short int accum; short int sat;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-433'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-432'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* length -->
-        <var-decl name='length' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
+        <var-decl name='length' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- short int accum -->
-        <var-decl name='accum' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
+        <var-decl name='accum' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
         <!-- short int sat -->
-        <var-decl name='sat' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
+        <var-decl name='sat' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
       </data-member>
     </class-decl>
     <!-- short int -->
-    <type-decl name='short int' size-in-bits='16' id='type-id-446'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-445'/>
     <!-- struct {gnu_v3_ctor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-434'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-433'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_ctor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
+        <var-decl name='kind' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
+        <var-decl name='name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_ctor_kinds -->
-    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-447'>
+    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-446'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='gnu_v3_complete_object_ctor' value='1'/>
       <enumerator name='gnu_v3_base_object_ctor' value='2'/>
@@ -9720,18 +9718,18 @@
       <enumerator name='gnu_v3_object_ctor_group' value='4'/>
     </enum-decl>
     <!-- struct {gnu_v3_dtor_kinds kind; demangle_component* name;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-435'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-434'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- gnu_v3_dtor_kinds kind -->
-        <var-decl name='kind' type-id='type-id-448' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
+        <var-decl name='kind' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* name -->
-        <var-decl name='name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
+        <var-decl name='name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum gnu_v3_dtor_kinds -->
-    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-448'>
+    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-447'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='gnu_v3_deleting_dtor' value='1'/>
       <enumerator name='gnu_v3_complete_object_dtor' value='2'/>
@@ -9739,14 +9737,14 @@
       <enumerator name='gnu_v3_object_dtor_group' value='4'/>
     </enum-decl>
     <!-- struct {const demangle_builtin_type_info* type;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-436'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-435'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const demangle_builtin_type_info* type -->
-        <var-decl name='type' type-id='type-id-449' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
+        <var-decl name='type' type-id='type-id-448' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct demangle_builtin_type_info -->
-    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-450'>
+    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-449'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* demangle_builtin_type_info::name -->
         <var-decl name='name' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='80' column='1'/>
@@ -9765,11 +9763,11 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- d_builtin_type_print demangle_builtin_type_info::print -->
-        <var-decl name='print' type-id='type-id-451' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
+        <var-decl name='print' type-id='type-id-450' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
       </data-member>
     </class-decl>
     <!-- enum d_builtin_type_print -->
-    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-451'>
+    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-450'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='D_PRINT_DEFAULT' value='0'/>
       <enumerator name='D_PRINT_INT' value='1'/>
@@ -9783,11 +9781,11 @@
       <enumerator name='D_PRINT_VOID' value='9'/>
     </enum-decl>
     <!-- const demangle_builtin_type_info -->
-    <qualified-type-def type-id='type-id-450' const='yes' id='type-id-452'/>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-451'/>
     <!-- const demangle_builtin_type_info* -->
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-449'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-448'/>
     <!-- struct {const char* string; int len;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-437'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-436'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* string -->
         <var-decl name='string' type-id='type-id-8' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='506' column='1'/>
@@ -9798,35 +9796,35 @@
       </data-member>
     </class-decl>
     <!-- struct {long int number;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-438'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-437'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- long int number -->
         <var-decl name='number' type-id='type-id-21' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {int character;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-439'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-438'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- int character -->
         <var-decl name='character' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='521' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* left; demangle_component* right;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-440'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-439'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* left -->
-        <var-decl name='left' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
+        <var-decl name='left' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- demangle_component* right -->
-        <var-decl name='right' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
+        <var-decl name='right' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
       </data-member>
     </class-decl>
     <!-- struct {demangle_component* sub; int num;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-441'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-440'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- demangle_component* sub -->
-        <var-decl name='sub' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
+        <var-decl name='sub' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- int num -->
@@ -9836,7 +9834,7 @@
     <!-- int cplus_demangle_fill_name(demangle_component*, const char*, int) -->
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='s' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <!-- parameter of type 'int' -->
@@ -9847,38 +9845,38 @@
     <!-- int cplus_demangle_fill_extended_operator(demangle_component*, int, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_extended_operator' mangled-name='cplus_demangle_fill_extended_operator' filepath='../.././libiberty/cp-demangle.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_extended_operator'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='args' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
+      <parameter type-id='type-id-444' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int cplus_demangle_fill_ctor(demangle_component*, gnu_v3_ctor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_ctor' mangled-name='cplus_demangle_fill_ctor' filepath='../.././libiberty/cp-demangle.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_ctor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
       <!-- parameter of type 'enum gnu_v3_ctor_kinds' -->
-      <parameter type-id='type-id-447' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
+      <parameter type-id='type-id-446' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
+      <parameter type-id='type-id-444' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- int cplus_demangle_fill_dtor(demangle_component*, gnu_v3_dtor_kinds, demangle_component*) -->
     <function-decl name='cplus_demangle_fill_dtor' mangled-name='cplus_demangle_fill_dtor' filepath='../.././libiberty/cp-demangle.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_dtor'>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
       <!-- parameter of type 'enum gnu_v3_dtor_kinds' -->
-      <parameter type-id='type-id-448' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
+      <parameter type-id='type-id-447' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
       <!-- parameter of type 'demangle_component*' -->
-      <parameter type-id='type-id-445' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
+      <parameter type-id='type-id-444' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- struct d_info -->
-    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-453'>
+    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-452'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- const char* d_info::s -->
         <var-decl name='s' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='96' column='1'/>
@@ -9897,7 +9895,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- demangle_component* d_info::comps -->
-        <var-decl name='comps' type-id='type-id-445' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
+        <var-decl name='comps' type-id='type-id-444' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <!-- int d_info::next_comp -->
@@ -9909,7 +9907,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <!-- demangle_component** d_info::subs -->
-        <var-decl name='subs' type-id='type-id-454' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
+        <var-decl name='subs' type-id='type-id-453' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- int d_info::next_sub -->
@@ -9925,7 +9923,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- demangle_component* d_info::last_name -->
-        <var-decl name='last_name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
+        <var-decl name='last_name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <!-- int d_info::expansion -->
@@ -9933,41 +9931,41 @@
       </data-member>
     </class-decl>
     <!-- demangle_component** -->
-    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-454'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-453'/>
     <!-- d_info* -->
-    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-454'/>
     <!-- demangle_component* cplus_demangle_type(d_info*) -->
     <function-decl name='cplus_demangle_type' mangled-name='cplus_demangle_type' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_type'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-455' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
+      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-445'/>
+      <return type-id='type-id-444'/>
     </function-decl>
     <!-- demangle_component* cplus_demangle_mangled_name(d_info*, int) -->
     <function-decl name='cplus_demangle_mangled_name' mangled-name='cplus_demangle_mangled_name' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_mangled_name'>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-455' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
+      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='top_level' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <!-- demangle_component* -->
-      <return type-id='type-id-445'/>
+      <return type-id='type-id-444'/>
     </function-decl>
     <!-- const demangle_component -->
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-456'/>
+    <qualified-type-def type-id='type-id-426' const='yes' id='type-id-455'/>
     <!-- const demangle_component* -->
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
+    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
     <!-- void (const char*, typedef size_t, void*)* -->
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-458'/>
     <!-- typedef void (const char*, typedef size_t, void*)* demangle_callbackref -->
-    <typedef-decl name='demangle_callbackref' type-id='type-id-459' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-460'/>
+    <typedef-decl name='demangle_callbackref' type-id='type-id-458' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-459'/>
     <!-- int cplus_demangle_print_callback(int, const demangle_component*, demangle_callbackref, void*) -->
     <function-decl name='cplus_demangle_print_callback' mangled-name='cplus_demangle_print_callback' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print_callback'>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-457' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
+      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-460' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
+      <parameter type-id='type-id-459' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <!-- int -->
@@ -9978,11 +9976,11 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'const demangle_component*' -->
-      <parameter type-id='type-id-457' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
+      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='estimate' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- parameter of type 'size_t*' -->
-      <parameter type-id='type-id-217' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
+      <parameter type-id='type-id-219' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <!-- char* -->
       <return type-id='type-id-9'/>
     </function-decl>
@@ -9995,7 +9993,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <!-- parameter of type 'd_info*' -->
-      <parameter type-id='type-id-455' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
+      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -10006,7 +10004,7 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-460' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
+      <parameter type-id='type-id-459' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <!-- int -->
@@ -10017,7 +10015,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1'/>
       <!-- parameter of type 'typedef demangle_callbackref' -->
-      <parameter type-id='type-id-460' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
+      <parameter type-id='type-id-459' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <!-- int -->
@@ -10028,37 +10026,37 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1'/>
       <!-- enum gnu_v3_ctor_kinds -->
-      <return type-id='type-id-447'/>
+      <return type-id='type-id-446'/>
     </function-decl>
     <!-- gnu_v3_dtor_kinds is_gnu_v3_mangled_dtor(const char*) -->
     <function-decl name='is_gnu_v3_mangled_dtor' mangled-name='is_gnu_v3_mangled_dtor' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_dtor'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1'/>
       <!-- enum gnu_v3_dtor_kinds -->
-      <return type-id='type-id-448'/>
+      <return type-id='type-id-447'/>
     </function-decl>
 
-    <!-- demangle_operator_info[58] -->
-    <array-type-def dimensions='1' type-id='type-id-443' size-in-bits='11136' id='type-id-461'>
+    <!-- const demangle_operator_info[58] -->
+    <array-type-def dimensions='1' type-id='type-id-460' size-in-bits='11136' id='type-id-461'>
       <!-- <anonymous range>[58] -->
       <subrange length='58' type-id='type-id-22' id='type-id-462'/>
 
     </array-type-def>
-    <!-- demangle_operator_info[58] const -->
-    <qualified-type-def type-id='type-id-461' const='yes' id='type-id-463'/>
-    <!-- demangle_operator_info[58] const cplus_demangle_operators -->
-    <var-decl name='cplus_demangle_operators' type-id='type-id-463' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
+    <!-- const demangle_operator_info -->
+    <qualified-type-def type-id='type-id-442' const='yes' id='type-id-460'/>
+    <!-- const demangle_operator_info cplus_demangle_operators[58] -->
+    <var-decl name='cplus_demangle_operators' type-id='type-id-461' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
 
-    <!-- demangle_builtin_type_info[33] -->
-    <array-type-def dimensions='1' type-id='type-id-450' size-in-bits='8448' id='type-id-464'>
+    <!-- const demangle_builtin_type_info[33] -->
+    <array-type-def dimensions='1' type-id='type-id-463' size-in-bits='8448' id='type-id-464'>
       <!-- <anonymous range>[33] -->
       <subrange length='33' type-id='type-id-22' id='type-id-465'/>
 
     </array-type-def>
-    <!-- demangle_builtin_type_info[33] const -->
-    <qualified-type-def type-id='type-id-464' const='yes' id='type-id-466'/>
-    <!-- demangle_builtin_type_info[33] const cplus_demangle_builtin_types -->
-    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-466' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
+    <!-- const demangle_builtin_type_info -->
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-463'/>
+    <!-- const demangle_builtin_type_info cplus_demangle_builtin_types[33] -->
+    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-464' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
     <!-- void* realloc(void*, size_t) -->
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'void*' -->
@@ -10069,7 +10067,7 @@
       <return type-id='type-id-2'/>
     </function-decl>
     <!-- void (const char*, size_t, void*) -->
-    <function-type size-in-bits='64' id='type-id-458'>
+    <function-type size-in-bits='64' id='type-id-457'>
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8'/>
       <!-- parameter of type 'typedef size_t' -->
@@ -10082,30 +10080,30 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- struct md5_ctx -->
-    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-467'>
+    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-466'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- md5_uint32 md5_ctx::A -->
-        <var-decl name='A' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
+        <var-decl name='A' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <!-- md5_uint32 md5_ctx::B -->
-        <var-decl name='B' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
+        <var-decl name='B' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- md5_uint32 md5_ctx::C -->
-        <var-decl name='C' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
+        <var-decl name='C' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <!-- md5_uint32 md5_ctx::D -->
-        <var-decl name='D' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
+        <var-decl name='D' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- md5_uint32 md5_ctx::total[2] -->
-        <var-decl name='total' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
+        <var-decl name='total' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <!-- md5_uint32 md5_ctx::buflen -->
-        <var-decl name='buflen' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
+        <var-decl name='buflen' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <!-- char md5_ctx::buffer[128] -->
@@ -10113,33 +10111,33 @@
       </data-member>
     </class-decl>
     <!-- typedef unsigned int uint32_t -->
-    <typedef-decl name='uint32_t' type-id='type-id-35' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-470'/>
+    <typedef-decl name='uint32_t' type-id='type-id-35' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-469'/>
     <!-- typedef uint32_t md5_uint32 -->
-    <typedef-decl name='md5_uint32' type-id='type-id-470' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-468'/>
+    <typedef-decl name='md5_uint32' type-id='type-id-469' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-467'/>
 
     <!-- md5_uint32[2] -->
-    <array-type-def dimensions='1' type-id='type-id-468' size-in-bits='64' id='type-id-469'>
+    <array-type-def dimensions='1' type-id='type-id-467' size-in-bits='64' id='type-id-468'>
       <!-- <anonymous range>[2] -->
-      <subrange length='2' type-id='type-id-22' id='type-id-471'/>
+      <subrange length='2' type-id='type-id-22' id='type-id-470'/>
 
     </array-type-def>
     <!-- md5_ctx* -->
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-471'/>
     <!-- void md5_init_ctx(md5_ctx*) -->
     <function-decl name='md5_init_ctx' mangled-name='md5_init_ctx' filepath='../.././libiberty/md5.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_init_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- const md5_ctx -->
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-473'/>
+    <qualified-type-def type-id='type-id-466' const='yes' id='type-id-472'/>
     <!-- const md5_ctx* -->
-    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-474'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-473'/>
     <!-- void* md5_read_ctx(const md5_ctx*, void*) -->
     <function-decl name='md5_read_ctx' mangled-name='md5_read_ctx' filepath='../.././libiberty/md5.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_read_ctx'>
       <!-- parameter of type 'const md5_ctx*' -->
-      <parameter type-id='type-id-474' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
+      <parameter type-id='type-id-473' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='resbuf' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <!-- void* -->
@@ -10152,7 +10150,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -10163,14 +10161,14 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='len' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void* md5_finish_ctx(md5_ctx*, void*) -->
     <function-decl name='md5_finish_ctx' mangled-name='md5_finish_ctx' filepath='../.././libiberty/md5.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_finish_ctx'>
       <!-- parameter of type 'md5_ctx*' -->
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='resbuf' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <!-- void* -->
@@ -10387,7 +10385,7 @@
     <!-- size_t htab_size(htab_t) -->
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <!-- typedef size_t -->
       <return type-id='type-id-5'/>
     </function-decl>
@@ -10396,55 +10394,55 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-180' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
+      <parameter type-id='type-id-182' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-181' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
+      <parameter type-id='type-id-183' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-193'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- htab_t htab_create_typed_alloc(size_t, htab_hash, htab_eq, htab_del, htab_alloc, htab_alloc, htab_free) -->
     <function-decl name='htab_create_typed_alloc' mangled-name='htab_create_typed_alloc' filepath='../.././libiberty/hashtab.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_typed_alloc'>
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-178' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-180' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
       <!-- parameter of type 'typedef htab_alloc' -->
-      <parameter type-id='type-id-178' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-180' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- parameter of type 'typedef htab_free' -->
-      <parameter type-id='type-id-179' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-181' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-193'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- void htab_set_functions_ex(htab_t, htab_hash, htab_eq, htab_del, void*, htab_alloc_with_arg, htab_free_with_arg) -->
     <function-decl name='htab_set_functions_ex' mangled-name='htab_set_functions_ex' filepath='../.././libiberty/hashtab.c' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_set_functions_ex'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <!-- parameter of type 'typedef htab_alloc_with_arg' -->
-      <parameter type-id='type-id-180' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-182' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- parameter of type 'typedef htab_free_with_arg' -->
-      <parameter type-id='type-id-181' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-183' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
@@ -10453,25 +10451,25 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
       <!-- parameter of type 'typedef htab_hash' -->
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
       <!-- parameter of type 'typedef htab_eq' -->
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
       <!-- parameter of type 'typedef htab_del' -->
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
       <!-- typedef htab_t -->
-      <return type-id='type-id-193'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <!-- void htab_empty(htab_t) -->
     <function-decl name='htab_empty' mangled-name='htab_empty' filepath='../.././libiberty/hashtab.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_empty'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void* htab_find(htab_t, void*) -->
     <function-decl name='htab_find' mangled-name='htab_find' filepath='../.././libiberty/hashtab.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <!-- void* -->
@@ -10480,29 +10478,29 @@
     <!-- void** htab_find_slot(htab_t, void*, insert_option) -->
     <function-decl name='htab_find_slot' mangled-name='htab_find_slot' filepath='../.././libiberty/hashtab.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- parameter of type 'enum insert_option' -->
-      <parameter type-id='type-id-194' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-196' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <!-- void** -->
       <return type-id='type-id-102'/>
     </function-decl>
     <!-- void htab_remove_elt_with_hash(htab_t, void*, hashval_t) -->
     <function-decl name='htab_remove_elt_with_hash' mangled-name='htab_remove_elt_with_hash' filepath='../.././libiberty/hashtab.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt_with_hash'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-173' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-175' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- void htab_remove_elt(htab_t, void*) -->
     <function-decl name='htab_remove_elt' mangled-name='htab_remove_elt' filepath='../.././libiberty/hashtab.c' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <!-- void -->
@@ -10511,7 +10509,7 @@
     <!-- void htab_clear_slot(htab_t, void**) -->
     <function-decl name='htab_clear_slot' mangled-name='htab_clear_slot' filepath='../.././libiberty/hashtab.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_clear_slot'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- parameter of type 'void**' -->
       <parameter type-id='type-id-102' name='slot' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <!-- void -->
@@ -10520,22 +10518,22 @@
     <!-- void htab_traverse_noresize(htab_t, htab_trav, void*) -->
     <function-decl name='htab_traverse_noresize' mangled-name='htab_traverse_noresize' filepath='../.././libiberty/hashtab.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_traverse_noresize'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'typedef htab_trav' -->
-      <parameter type-id='type-id-405' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-404' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- parameter of type 'void*' -->
       <parameter type-id='type-id-2' name='info' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- double -->
-    <type-decl name='double' size-in-bits='64' id='type-id-475'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-474'/>
     <!-- double htab_collisions(htab_t) -->
     <function-decl name='htab_collisions' mangled-name='htab_collisions' filepath='../.././libiberty/hashtab.c' line='807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_collisions'>
       <!-- parameter of type 'typedef htab_t' -->
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
       <!-- double -->
-      <return type-id='type-id-475'/>
+      <return type-id='type-id-474'/>
     </function-decl>
     <!-- hashval_t iterative_hash(void*, size_t, hashval_t) -->
     <function-decl name='iterative_hash' mangled-name='iterative_hash' filepath='../.././libiberty/hashtab.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterative_hash'>
@@ -10544,14 +10542,14 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5' name='length' filepath='../.././libiberty/hashtab.c' line='932' column='1'/>
       <!-- parameter of type 'typedef hashval_t' -->
-      <parameter type-id='type-id-173' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
+      <parameter type-id='type-id-175' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
       <!-- typedef hashval_t -->
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-175'/>
     </function-decl>
     <!-- htab_hash htab_hash_pointer -->
-    <var-decl name='htab_hash_pointer' type-id='type-id-175' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
+    <var-decl name='htab_hash_pointer' type-id='type-id-177' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
     <!-- htab_eq htab_eq_pointer -->
-    <var-decl name='htab_eq_pointer' type-id='type-id-176' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
+    <var-decl name='htab_eq_pointer' type-id='type-id-178' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- void hex_init() -->
@@ -10559,10 +10557,8 @@
       <!-- void -->
       <return type-id='type-id-1'/>
     </function-decl>
-    <!-- unsigned char[256] const -->
-    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-476'/>
-    <!-- unsigned char[256] const _hex_value -->
-    <var-decl name='_hex_value' type-id='type-id-476' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
+    <!-- const unsigned char _hex_value[256] -->
+    <var-decl name='_hex_value' type-id='type-id-418' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const char* unix_lbasename(const char*) -->
@@ -10633,7 +10629,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <!-- pid_t* pex_obj::children -->
-        <var-decl name='children' type-id='type-id-477' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+        <var-decl name='children' type-id='type-id-475' 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 -->
@@ -10641,7 +10637,7 @@
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <!-- pex_time* pex_obj::time -->
-        <var-decl name='time' type-id='type-id-478' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+        <var-decl name='time' type-id='type-id-476' 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 -->
@@ -10669,7 +10665,7 @@
       </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-479' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+        <var-decl name='funcs' type-id='type-id-477' 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 -->
@@ -10677,13 +10673,13 @@
       </data-member>
     </class-decl>
     <!-- typedef int __pid_t -->
-    <typedef-decl name='__pid_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-480'/>
+    <typedef-decl name='__pid_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-478'/>
     <!-- typedef __pid_t pid_t -->
-    <typedef-decl name='pid_t' type-id='type-id-480' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-481'/>
+    <typedef-decl name='pid_t' type-id='type-id-478' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-479'/>
     <!-- pid_t* -->
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-477'/>
+    <pointer-type-def type-id='type-id-479' size-in-bits='64' id='type-id-475'/>
     <!-- struct pex_time -->
-    <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-482'>
+    <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-480'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- unsigned long int pex_time::user_seconds -->
         <var-decl name='user_seconds' type-id='type-id-4' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
@@ -10702,64 +10698,64 @@
       </data-member>
     </class-decl>
     <!-- pex_time* -->
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-478'/>
+    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-476'/>
     <!-- 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-483'>
+    <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-481'>
       <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-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-482' 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-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-482' 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-485' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-483' 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-486' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-484' 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-487' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-485' 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-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-486' 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-489' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-487' 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-489' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-487' 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-490' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
     <!-- int (pex_obj*, const char*, int)* -->
-    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-482'/>
     <!-- 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-492' size-in-bits='64' id='type-id-485'/>
+    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-483'/>
     <!-- int (pex_obj*, int)* -->
-    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-486'/>
+    <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-484'/>
     <!-- typedef pid_t (pex_obj*, typedef pid_t, int*, pex_time*, int, const char**, int*)* -->
-    <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-487'/>
+    <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-485'/>
     <!-- int (pex_obj*, int*, int)* -->
-    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-488'/>
+    <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-486'/>
     <!-- FILE* (pex_obj*, int, int)* -->
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-489'/>
+    <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-487'/>
     <!-- void (pex_obj*)* -->
-    <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-490'/>
+    <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-488'/>
     <!-- const pex_funcs -->
-    <qualified-type-def type-id='type-id-483' const='yes' id='type-id-498'/>
+    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-496'/>
     <!-- const pex_funcs* -->
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-477'/>
     <!-- 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' -->
@@ -10769,7 +10765,7 @@
       <!-- parameter of type 'const char*' -->
       <parameter type-id='type-id-8' name='tempbase' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <!-- parameter of type 'const pex_funcs*' -->
-      <parameter type-id='type-id-479' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
+      <parameter type-id='type-id-477' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
       <!-- pex_obj* -->
       <return type-id='type-id-29'/>
     </function-decl>
@@ -10830,12 +10826,12 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3' name='count' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <!-- parameter of type 'pex_time*' -->
-      <parameter type-id='type-id-478' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
+      <parameter type-id='type-id-476' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <!-- int -->
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- FILE* (pex_obj*, int, int) -->
-    <function-type size-in-bits='64' id='type-id-496'>
+    <function-type size-in-bits='64' id='type-id-494'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- parameter of type 'int' -->
@@ -10846,7 +10842,7 @@
       <return type-id='type-id-27'/>
     </function-type>
     <!-- int (pex_obj*, const char*, int) -->
-    <function-type size-in-bits='64' id='type-id-491'>
+    <function-type size-in-bits='64' id='type-id-489'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- parameter of type 'const char*' -->
@@ -10857,7 +10853,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- int (pex_obj*, int) -->
-    <function-type size-in-bits='64' id='type-id-493'>
+    <function-type size-in-bits='64' id='type-id-491'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- parameter of type 'int' -->
@@ -10866,7 +10862,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- int (pex_obj*, int*, int) -->
-    <function-type size-in-bits='64' id='type-id-495'>
+    <function-type size-in-bits='64' id='type-id-493'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- parameter of type 'int*' -->
@@ -10877,7 +10873,7 @@
       <return type-id='type-id-3'/>
     </function-type>
     <!-- pid_t (pex_obj*, int, const char*, char* const*, char* const*, int, int, int, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-492'>
+    <function-type size-in-bits='64' id='type-id-490'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- parameter of type 'int' -->
@@ -10897,33 +10893,33 @@
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-272'/>
+      <parameter type-id='type-id-271'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-62'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-481'/>
+      <return type-id='type-id-479'/>
     </function-type>
     <!-- pid_t (pex_obj*, pid_t, int*, pex_time*, int, const char**, int*) -->
-    <function-type size-in-bits='64' id='type-id-494'>
+    <function-type size-in-bits='64' id='type-id-492'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- parameter of type 'typedef pid_t' -->
-      <parameter type-id='type-id-481'/>
+      <parameter type-id='type-id-479'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-62'/>
       <!-- parameter of type 'pex_time*' -->
-      <parameter type-id='type-id-478'/>
+      <parameter type-id='type-id-476'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'const char**' -->
-      <parameter type-id='type-id-272'/>
+      <parameter type-id='type-id-271'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-62'/>
       <!-- typedef pid_t -->
-      <return type-id='type-id-481'/>
+      <return type-id='type-id-479'/>
     </function-type>
     <!-- void (pex_obj*) -->
-    <function-type size-in-bits='64' id='type-id-497'>
+    <function-type size-in-bits='64' id='type-id-495'>
       <!-- parameter of type 'pex_obj*' -->
       <parameter type-id='type-id-29'/>
       <!-- void -->
@@ -10932,7 +10928,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- const pex_funcs funcs -->
-    <var-decl name='funcs' type-id='type-id-498' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
+    <var-decl name='funcs' type-id='type-id-496' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <!-- int fcntl(int, int, ...) -->
     <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'int' -->
@@ -10951,10 +10947,10 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <!-- union {wait* __uptr; int* __iptr;} -->
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-499'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-497'>
       <data-member access='private'>
         <!-- wait* __uptr -->
-        <var-decl name='__uptr' type-id='type-id-500' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
+        <var-decl name='__uptr' type-id='type-id-498' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- int* __iptr -->
@@ -10962,22 +10958,22 @@
       </data-member>
     </union-decl>
     <!-- union wait -->
-    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-501'>
+    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-499'>
       <data-member access='private'>
         <!-- int wait::w_status -->
         <var-decl name='w_status' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='69' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} wait::__wait_terminated -->
-        <var-decl name='__wait_terminated' type-id='type-id-502' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
+        <var-decl name='__wait_terminated' type-id='type-id-500' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
       </data-member>
       <data-member access='private'>
         <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} wait::__wait_stopped -->
-        <var-decl name='__wait_stopped' type-id='type-id-503' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
+        <var-decl name='__wait_stopped' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
       </data-member>
     </union-decl>
     <!-- struct {unsigned int __w_termsig; unsigned int __w_coredump; unsigned int __w_retcode;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-502'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-500'>
       <data-member access='public' layout-offset-in-bits='25'>
         <!-- unsigned int __w_termsig -->
         <var-decl name='__w_termsig' type-id='type-id-35' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='73' column='1'/>
@@ -10992,7 +10988,7 @@
       </data-member>
     </class-decl>
     <!-- struct {unsigned int __w_stopval; unsigned int __w_stopsig;} -->
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-503'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-501'>
       <data-member access='public' layout-offset-in-bits='24'>
         <!-- unsigned int __w_stopval -->
         <var-decl name='__w_stopval' type-id='type-id-35' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='88' column='1'/>
@@ -11003,18 +10999,18 @@
       </data-member>
     </class-decl>
     <!-- wait* -->
-    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-500'/>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-498'/>
     <!-- typedef __anonymous_union__ __WAIT_STATUS -->
-    <typedef-decl name='__WAIT_STATUS' type-id='type-id-499' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-504'/>
+    <typedef-decl name='__WAIT_STATUS' type-id='type-id-497' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-502'/>
     <!-- struct rusage -->
-    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-505'>
+    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-503'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- timeval rusage::ru_utime -->
-        <var-decl name='ru_utime' type-id='type-id-506' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
+        <var-decl name='ru_utime' type-id='type-id-504' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <!-- timeval rusage::ru_stime -->
-        <var-decl name='ru_stime' type-id='type-id-506' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
+        <var-decl name='ru_stime' type-id='type-id-504' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <!-- long int rusage::ru_maxrss -->
@@ -11074,48 +11070,48 @@
       </data-member>
     </class-decl>
     <!-- struct timeval -->
-    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-506'>
+    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-504'>
       <data-member access='public' layout-offset-in-bits='0'>
         <!-- __time_t timeval::tv_sec -->
         <var-decl name='tv_sec' type-id='type-id-54' visibility='default' filepath='/usr/include/bits/time.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <!-- __suseconds_t timeval::tv_usec -->
-        <var-decl name='tv_usec' type-id='type-id-507' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
+        <var-decl name='tv_usec' type-id='type-id-505' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
       </data-member>
     </class-decl>
     <!-- typedef long int __suseconds_t -->
-    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-507'/>
+    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-505'/>
     <!-- rusage* -->
-    <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-508'/>
+    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-506'/>
     <!-- __pid_t wait4(__pid_t, __WAIT_STATUS, int, rusage*) -->
     <function-decl name='wait4' filepath='/usr/include/sys/wait.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-478'/>
       <!-- parameter of type 'typedef __WAIT_STATUS' -->
-      <parameter type-id='type-id-504'/>
+      <parameter type-id='type-id-502'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- parameter of type 'rusage*' -->
-      <parameter type-id='type-id-508'/>
+      <parameter type-id='type-id-506'/>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-478'/>
     </function-decl>
     <!-- __pid_t waitpid(__pid_t, int*, int) -->
     <function-decl name='waitpid' filepath='/usr/include/sys/wait.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-478'/>
       <!-- parameter of type 'int*' -->
       <parameter type-id='type-id-62'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-478'/>
     </function-decl>
     <!-- int kill(__pid_t, int) -->
     <function-decl name='kill' filepath='/usr/include/signal.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef __pid_t' -->
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-478'/>
       <!-- parameter of type 'int' -->
       <parameter type-id='type-id-3'/>
       <!-- int -->
@@ -11130,7 +11126,7 @@
       <!-- parameter of type 'typedef size_t' -->
       <parameter type-id='type-id-5'/>
       <!-- typedef ssize_t -->
-      <return type-id='type-id-391'/>
+      <return type-id='type-id-390'/>
     </function-decl>
     <!-- void _exit(int) -->
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11149,7 +11145,7 @@
     <!-- __pid_t vfork() -->
     <function-decl name='vfork' filepath='/usr/include/unistd.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- typedef __pid_t -->
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-478'/>
     </function-decl>
     <!-- int dup2(int, int) -->
     <function-decl name='dup2' filepath='/usr/include/unistd.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11181,20 +11177,20 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
 
-    <!-- unsigned short int[256] -->
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='4096' id='type-id-509'>
+    <!-- const unsigned short int[256] -->
+    <array-type-def dimensions='1' type-id='type-id-507' size-in-bits='4096' id='type-id-508'>
       <!-- <anonymous range>[256] -->
-      <subrange length='256' type-id='type-id-22' id='type-id-400'/>
+      <subrange length='256' type-id='type-id-22' id='type-id-399'/>
 
     </array-type-def>
-    <!-- unsigned short int[256] const -->
-    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-510'/>
-    <!-- unsigned short int[256] const _sch_istable -->
-    <var-decl name='_sch_istable' type-id='type-id-510' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
-    <!-- unsigned char[256] const _sch_toupper -->
-    <var-decl name='_sch_toupper' type-id='type-id-476' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
-    <!-- unsigned char[256] const _sch_tolower -->
-    <var-decl name='_sch_tolower' type-id='type-id-476' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
+    <!-- const unsigned short int -->
+    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-507'/>
+    <!-- const unsigned short int _sch_istable[256] -->
+    <var-decl name='_sch_istable' type-id='type-id-508' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
+    <!-- const unsigned char _sch_toupper[256] -->
+    <var-decl name='_sch_toupper' type-id='type-id-418' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
+    <!-- const unsigned char _sch_tolower[256] -->
+    <var-decl name='_sch_tolower' type-id='type-id-418' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <!-- int __lxstat(int, const char*, stat*) -->
@@ -11222,13 +11218,13 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <!-- typedef long int __intptr_t -->
-    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-511'/>
+    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-509'/>
     <!-- typedef __intptr_t intptr_t -->
-    <typedef-decl name='intptr_t' type-id='type-id-511' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-512'/>
+    <typedef-decl name='intptr_t' type-id='type-id-509' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-510'/>
     <!-- void* sbrk(intptr_t) -->
     <function-decl name='sbrk' filepath='/usr/include/unistd.h' line='1053' column='1' visibility='default' binding='global' size-in-bits='64'>
       <!-- parameter of type 'typedef intptr_t' -->
-      <parameter type-id='type-id-512'/>
+      <parameter type-id='type-id-510'/>
       <!-- void* -->
       <return type-id='type-id-2'/>
     </function-decl>

diff --git a/tests/data/test-diff-filter/PR24430-fold-qualified-array-clang b/tests/data/test-diff-filter/PR24430-fold-qualified-array-clang
new file mode 100755 (executable)
index 0000000..5cf5642
Binary files /dev/null and b/tests/data/test-diff-filter/PR24430-fold-qualified-array-clang differ

diff --git a/tests/data/test-diff-filter/PR24430-fold-qualified-array-gcc b/tests/data/test-diff-filter/PR24430-fold-qualified-array-gcc
new file mode 100755 (executable)
index 0000000..811ffdf
Binary files /dev/null and b/tests/data/test-diff-filter/PR24430-fold-qualified-array-gcc differ

diff --git a/tests/data/test-diff-filter/PR24430-fold-qualified-array-report-0.txt b/tests/data/test-diff-filter/PR24430-fold-qualified-array-report-0.txt
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/tests/data/test-diff-filter/test33-report-0.txt b/tests/data/test-diff-filter/test33-report-0.txt
index 7bc030d..e69de29 100644 (file)
--- a/tests/data/test-diff-filter/test33-report-0.txt
+++ b/tests/data/test-diff-filter/test33-report-0.txt
@@ -1,10 +0,0 @@
-Functions changes summary: 0 Removed, 0 Changed, 0 Added function
-Variables changes summary: 0 Removed, 1 Changed, 0 Added variable
-
-1 Changed variable:
-
-  [C]'const size_t[2][1][17][2] const _elf_fmsize' was changed to 'const size_t _elf_fmsize[2][1][17][2]':
-    type of variable changed:
-     entity changed from 'const size_t[2][1][17][2] const' to 'const size_t[2][1][17][2]'
-
-

diff --git a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
index f7dbf64..c87590e 100644 (file)
--- a/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
+++ b/tests/data/test-diff-pkg/nss-3.23.0-1.0.fc23.x86_64-report-0.txt
@@ -1,6 +1,6 @@
 ================ changes of 'libnss3.so'===============
   Functions changes summary: 0 Removed, 1 Changed (62 filtered out), 0 Added functions
-  Variables changes summary: 0 Removed, 0 Changed (36 filtered out), 0 Added variables
+  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
   1 function with some indirect sub-type change:
 
@@ -67,17 +67,19 @@
 
   1 Changed variable:
 
-    [C]'PRUint16[74] const SSL_ImplementedCiphers' was changed to 'const PRUint16[69] const SSL_ImplementedCiphers' at sslenum.c:51:1:
+    [C]'const PRUint16 SSL_ImplementedCiphers[74]' was changed to 'const PRUint16 SSL_ImplementedCiphers[69]' at sslenum.c:51:1:
       size of symbol changed from 148 to 138
       type of variable changed:
-       'PRUint16[74] const' changed to 'const PRUint16[69] const'
+       type name changed from 'PRUint16[74]' to 'const PRUint16[69]'
+       array type size changed from 1184 to 1104
+       array type subrange 1 changed length from 74 to 69
 
 
 ================ end of changes of 'libssl3.so'===============
 
 ================ changes of 'libsmime3.so'===============
   Functions changes summary: 0 Removed, 1 Changed (127 filtered out), 0 Added functions
-  Variables changes summary: 0 Removed, 0 Changed (2 filtered out), 0 Added variables
+  Variables changes summary: 0 Removed, 0 Changed, 0 Added variable
 
   1 function with some indirect sub-type change:
 

diff --git a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
index 42618f6..06483c9 100644 (file)
--- a/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
+++ b/tests/data/test-read-dwarf/PR22122-libftdc.so.abi
@@ -3007,66 +3007,64 @@
     <reference-type-def kind='lvalue' type-id='type-id-157' size-in-bits='64' id='type-id-160'/>
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-158'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='200' id='type-id-166'>
-      <subrange length='25' type-id='type-id-165' id='type-id-167'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='200' id='type-id-167'>
+      <subrange length='25' type-id='type-id-165' id='type-id-168'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-168'/>
-    <reference-type-def kind='lvalue' type-id='type-id-168' size-in-bits='64' id='type-id-159'/>
+    <qualified-type-def type-id='type-id-85' const='yes' id='type-id-166'/>
+    <reference-type-def kind='lvalue' type-id='type-id-167' size-in-bits='64' id='type-id-159'/>
     <qualified-type-def type-id='type-id-83' const='yes' id='type-id-169'/>
     <reference-type-def kind='lvalue' type-id='type-id-169' size-in-bits='64' id='type-id-161'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='168' id='type-id-170'>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='168' id='type-id-170'>
       <subrange length='21' type-id='type-id-165' id='type-id-171'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-170' const='yes' id='type-id-172'/>
-    <reference-type-def kind='lvalue' type-id='type-id-172' size-in-bits='64' id='type-id-162'/>
+    <reference-type-def kind='lvalue' type-id='type-id-170' size-in-bits='64' id='type-id-162'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='192' id='type-id-173'>
-      <subrange length='24' type-id='type-id-165' id='type-id-174'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='192' id='type-id-172'>
+      <subrange length='24' type-id='type-id-165' id='type-id-173'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-173' const='yes' id='type-id-175'/>
-    <reference-type-def kind='lvalue' type-id='type-id-175' size-in-bits='64' id='type-id-163'/>
-    <qualified-type-def type-id='type-id-157' const='yes' id='type-id-176'/>
-    <reference-type-def kind='lvalue' type-id='type-id-176' size-in-bits='64' id='type-id-78'/>
+    <reference-type-def kind='lvalue' type-id='type-id-172' size-in-bits='64' id='type-id-163'/>
+    <qualified-type-def type-id='type-id-157' const='yes' id='type-id-174'/>
+    <reference-type-def kind='lvalue' type-id='type-id-174' size-in-bits='64' id='type-id-78'/>
     <typedef-decl name='size_type' type-id='type-id-42' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='236' column='1' id='type-id-47'/>
-    <qualified-type-def type-id='type-id-36' const='yes' id='type-id-177'/>
-    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-46'/>
+    <qualified-type-def type-id='type-id-36' const='yes' id='type-id-175'/>
+    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-46'/>
     <pointer-type-def type-id='type-id-36' size-in-bits='64' id='type-id-48'/>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-178'/>
-    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-49'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-176'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-49'/>
     <reference-type-def kind='lvalue' type-id='type-id-52' size-in-bits='64' id='type-id-53'/>
     <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-7'/>
     <reference-type-def kind='lvalue' type-id='type-id-6' size-in-bits='64' id='type-id-8'/>
     <reference-type-def kind='rvalue' type-id='type-id-6' size-in-bits='64' id='type-id-9'/>
     <type-decl name='bool' size-in-bits='8' id='type-id-11'/>
-    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-179'/>
-    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-10'/>
+    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-177'/>
+    <pointer-type-def type-id='type-id-177' size-in-bits='64' id='type-id-10'/>
     <pointer-type-def type-id='type-id-79' size-in-bits='64' id='type-id-12'/>
-    <qualified-type-def type-id='type-id-79' const='yes' id='type-id-180'/>
-    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-81'/>
+    <qualified-type-def type-id='type-id-79' const='yes' id='type-id-178'/>
+    <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-81'/>
     <reference-type-def kind='lvalue' type-id='type-id-73' size-in-bits='64' id='type-id-84'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-4'/>
     <reference-type-def kind='rvalue' type-id='type-id-73' size-in-bits='64' id='type-id-3'/>
     <pointer-type-def type-id='type-id-88' size-in-bits='64' id='type-id-90'/>
-    <qualified-type-def type-id='type-id-178' const='yes' id='type-id-181'/>
-    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-59'/>
-    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-182'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-30'/>
+    <qualified-type-def type-id='type-id-176' const='yes' id='type-id-179'/>
+    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-59'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-180'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-30'/>
     <pointer-type-def type-id='type-id-16' size-in-bits='64' id='type-id-32'/>
-    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-183'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-17'/>
+    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-181'/>
+    <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-17'/>
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-18'/>
     <pointer-type-def type-id='type-id-61' size-in-bits='64' id='type-id-62'/>
     <pointer-type-def type-id='type-id-63' size-in-bits='64' id='type-id-66'/>
     <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-68'/>
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-72'/>
-    <reference-type-def kind='lvalue' type-id='type-id-182' size-in-bits='64' id='type-id-33'/>
-    <reference-type-def kind='lvalue' type-id='type-id-184' size-in-bits='64' id='type-id-29'/>
-    <pointer-type-def type-id='type-id-185' size-in-bits='64' id='type-id-70'/>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-64'/>
+    <reference-type-def kind='lvalue' type-id='type-id-180' size-in-bits='64' id='type-id-33'/>
+    <reference-type-def kind='lvalue' type-id='type-id-182' size-in-bits='64' id='type-id-29'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-70'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-64'/>
     <function-type size-in-bits='64' id='type-id-131'>
       <parameter type-id='type-id-82'/>
       <parameter type-id='type-id-82'/>
@@ -3079,7 +3077,7 @@
     <reference-type-def kind='rvalue' type-id='type-id-16' size-in-bits='64' id='type-id-37'/>
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-28'/>
     <namespace-decl name='std'>
-      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-187'>
+      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-185'>
         <member-type access='private'>
           <typedef-decl name='iostate' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-71'/>
         </member-type>
@@ -3088,11 +3086,11 @@
     <namespace-decl name='std'>
       <typedef-decl name='streamsize' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/postypes.h' line='98' column='1' id='type-id-65'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-184'/>
-    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-185'/>
-    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-186'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-182'/>
+    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-183'/>
+    <qualified-type-def type-id='type-id-63' const='yes' id='type-id-184'/>
     <namespace-decl name='std'>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' is-declaration-only='yes' id='type-id-188'/>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' is-declaration-only='yes' id='type-id-186'/>
     </namespace-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
@@ -3120,14 +3118,14 @@
         <member-function access='public'>
           <function-decl name='intrusive_ptr' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-7' is-artificial='yes'/>
-            <parameter type-id='type-id-189'/>
+            <parameter type-id='type-id-187'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZN5boost13intrusive_ptrIN5mongo12SharedBuffer6HolderEEaSERKS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/intrusive_ptr.hpp' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-7' is-artificial='yes'/>
-            <parameter type-id='type-id-189'/>
+            <parameter type-id='type-id-187'/>
             <return type-id='type-id-8'/>
           </function-decl>
         </member-function>
@@ -3135,7 +3133,7 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
-        <typedef-decl name='string' type-id='type-id-16' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='74' column='1' id='type-id-190'/>
+        <typedef-decl name='string' type-id='type-id-16' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stringfwd.h' line='74' column='1' id='type-id-188'/>
       </namespace-decl>
 
 
@@ -3144,7 +3142,7 @@
 
       <namespace-decl name='this_thread'>
         <function-decl name='get_id' mangled-name='_ZNSt11this_thread6get_idEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <return type-id='type-id-191'/>
+          <return type-id='type-id-189'/>
         </function-decl>
         <function-decl name='yield' mangled-name='_ZNSt11this_thread5yieldEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='267' column='1' visibility='default' binding='global' size-in-bits='64'>
           <return type-id='type-id-5'/>
@@ -3152,27 +3150,27 @@
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-88' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-192'/>
+          <typedef-decl name='const_iterator' type-id='type-id-88' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='233' column='1' id='type-id-190'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-88' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-193'/>
+          <typedef-decl name='iterator' type-id='type-id-88' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='231' column='1' id='type-id-191'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE12emplace_backIJS5_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='556' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-46' is-artificial='yes'/>
-            <return type-id='type-id-192'/>
+            <return type-id='type-id-190'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -3184,28 +3182,28 @@
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <return type-id='type-id-193'/>
+            <return type-id='type-id-191'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <return type-id='type-id-193'/>
+            <return type-id='type-id-191'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
             <member-type access='private'>
-              <typedef-decl name='type' type-id='type-id-196' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-195'/>
+              <typedef-decl name='type' type-id='type-id-194' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='143' column='1' id='type-id-193'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -3224,7 +3222,7 @@
         <member-function access='public'>
           <function-decl name='unique_ptr' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEC2EOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3259,45 +3257,45 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-197' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-195' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-197'/>
+          <typedef-decl name='rebind_alloc&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-195'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt;, std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS2_EEEE9constructIS5_JS5_EEEvRS6_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
             <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCCollectorInterface *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo22FTDCCollectorInterfaceELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-198'/>
+            <parameter type-id='type-id-196'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNKSt14default_deleteIN5mongo22FTDCCollectorInterfaceEEclEPS1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-46' is-artificial='yes'/>
-            <parameter type-id='type-id-196'/>
+            <parameter type-id='type-id-194'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCCollectorInterface *, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-198'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-196'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCCollectorInterface *, std::default_delete&lt;mongo::FTDCCollectorInterface&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo22FTDCCollectorInterfaceESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-198'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-196'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3323,12 +3321,12 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
@@ -3408,7 +3406,7 @@
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='1004' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <return type-id='type-id-199'/>
+            <return type-id='type-id-197'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -3430,7 +3428,7 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
 
-      <class-decl name='FTDCCollectorInterface' size-in-bits='64' visibility='default' is-declaration-only='yes' id='type-id-200'/>
+      <class-decl name='FTDCCollectorInterface' size-in-bits='64' visibility='default' is-declaration-only='yes' id='type-id-198'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-function access='public'>
           <function-decl name='add' mangled-name='_ZN5mongo23FTDCCollectorCollection3addESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE' filepath='src/mongo/db/ftdc/collector.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo23FTDCCollectorCollection3addESt10unique_ptrINS_22FTDCCollectorInterfaceESt14default_deleteIS2_EE'>
@@ -3500,13 +3498,13 @@
         <member-function access='public'>
           <function-decl name='getServiceContext' mangled-name='_ZNK5mongo6Client17getServiceContextEv' filepath='src/mongo/db/client.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <return type-id='type-id-201'/>
+            <return type-id='type-id-199'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='StringData' mangled-name='_ZN5mongo10StringDataC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/base/string_data.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-202'/>
+            <parameter type-id='type-id-200'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3520,19 +3518,19 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ServiceContext' size-in-bits='2432' visibility='default' is-declaration-only='yes' id='type-id-203'/>
-      <class-decl name='OperationContext' size-in-bits='2176' visibility='default' is-declaration-only='yes' id='type-id-204'>
+      <class-decl name='ServiceContext' size-in-bits='2432' visibility='default' is-declaration-only='yes' id='type-id-201'/>
+      <class-decl name='OperationContext' size-in-bits='2176' visibility='default' is-declaration-only='yes' id='type-id-202'>
         <member-function access='public'>
           <function-decl name='lockState' mangled-name='_ZNK5mongo16OperationContext9lockStateEv' filepath='src/mongo/db/operation_context.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-205' is-artificial='yes'/>
-            <return type-id='type-id-206'/>
+            <parameter type-id='type-id-203' is-artificial='yes'/>
+            <return type-id='type-id-204'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Locker' size-in-bits='128' visibility='default' is-declaration-only='yes' id='type-id-207'>
+      <class-decl name='Locker' size-in-bits='128' visibility='default' is-declaration-only='yes' id='type-id-205'>
         <member-function access='public'>
           <function-decl name='setShouldConflictWithSecondaryBatchApplication' mangled-name='_ZN5mongo6Locker46setShouldConflictWithSecondaryBatchApplicationEb' filepath='src/mongo/db/concurrency/locker.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-206' is-artificial='yes'/>
+            <parameter type-id='type-id-204' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -3543,7 +3541,7 @@
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-208' visibility='default' is-declaration-only='yes' id='type-id-73'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-206' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-function access='public'>
           <function-decl name='ConstSharedBuffer' mangled-name='_ZN5mongo17ConstSharedBufferC2Ev' filepath='src/mongo/util/shared_buffer.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
@@ -3627,17 +3625,17 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIcvE11unsafeStoreERKcPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-209'/>
+                <parameter type-id='type-id-207'/>
                 <parameter type-id='type-id-35'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIxEEvE11unsafeStoreERKS3_PcPm' filepath='src/mongo/base/data_type_endian.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-211'/>
+                <parameter type-id='type-id-209'/>
                 <parameter type-id='type-id-35'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -3649,7 +3647,7 @@
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIivE10unsafeLoadEPiPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-147'/>
                 <parameter type-id='type-id-31'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -3657,7 +3655,7 @@
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIivE11unsafeStoreERKiPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-161'/>
                 <parameter type-id='type-id-35'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -3665,7 +3663,7 @@
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerINS_12LittleEndianIyEEvE10unsafeLoadEPS3_PKcPm' filepath='src/mongo/base/data_type_endian.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-77'/>
                 <parameter type-id='type-id-31'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -3692,13 +3690,13 @@
           <function-decl name='subobjStart' mangled-name='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE' filepath='src/mongo/bson/bsonobjbuilder.h' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder11subobjStartENS_10StringDataE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
             <parameter type-id='type-id-73'/>
-            <return type-id='type-id-212'/>
+            <return type-id='type-id-210'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='BSONObjBuilder' mangled-name='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE' filepath='src/mongo/bson/bsonobjbuilder.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilderC2ERNS_11_BufBuilderINS_21SharedBufferAllocatorEEE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-212'/>
+            <parameter type-id='type-id-210'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3734,17 +3732,17 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;char&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIcEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-209'/>
+            <parameter type-id='type-id-207'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;char&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIcEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3752,7 +3750,7 @@
           <function-decl name='unsafeLoad&lt;int&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIiEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-147'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3760,7 +3758,7 @@
           <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIiEEEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3768,24 +3766,24 @@
           <function-decl name='unsafeStore&lt;int&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIiEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-161'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIiEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='BufBuilder' type-id='type-id-73' filepath='src/mongo/bson/util/builder.h' line='365' column='1' id='type-id-208'/>
+      <typedef-decl name='BufBuilder' type-id='type-id-73' filepath='src/mongo/bson/util/builder.h' line='365' column='1' id='type-id-206'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-type access='public'>
-          <typedef-decl name='bytes_type' type-id='type-id-35' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-213'/>
+          <typedef-decl name='bytes_type' type-id='type-id-35' filepath='src/mongo/base/data_view.h' line='71' column='1' id='type-id-211'/>
         </member-type>
         <member-type access='public'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-74'>
@@ -3795,7 +3793,7 @@
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;char&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIcEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-42'/>
             <return type-id='type-id-84'/>
           </function-decl>
@@ -3803,7 +3801,7 @@
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;int&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIiEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-42'/>
             <return type-id='type-id-84'/>
           </function-decl>
@@ -3813,7 +3811,7 @@
             <parameter type-id='type-id-75' is-artificial='yes'/>
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-76'/>
-            <return type-id='type-id-211'/>
+            <return type-id='type-id-209'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -3833,18 +3831,18 @@
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-192' visibility='default' is-declaration-only='yes' id='type-id-88'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-190' visibility='default' is-declaration-only='yes' id='type-id-88'>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPSt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EESt6vectorIS6_SaIS6_EEEC2ERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-214'/>
+            <parameter type-id='type-id-212'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <return type-id='type-id-215'/>
+            <return type-id='type-id-213'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -3853,7 +3851,7 @@
           <function-decl name='construct&lt;std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt;, std::unique_ptr&lt;mongo::FTDCCollectorInterface, std::default_delete&lt;mongo::FTDCCollectorInterface&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt10unique_ptrIN5mongo22FTDCCollectorInterfaceESt14default_deleteIS3_EEE9constructIS6_JS6_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -3862,64 +3860,64 @@
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'/>
     </namespace-decl>
 
-    <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-216'/>
-    <qualified-type-def type-id='type-id-216' const='yes' id='type-id-217'/>
-    <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-218'/>
-    <qualified-type-def type-id='type-id-218' restrict='yes' id='type-id-219'/>
+    <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-214'/>
+    <qualified-type-def type-id='type-id-214' const='yes' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-215' size-in-bits='64' id='type-id-216'/>
+    <qualified-type-def type-id='type-id-216' restrict='yes' id='type-id-217'/>
     <function-decl name='wcsftime' filepath='/usr/include/wchar.h' line='858' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-101'/>
       <parameter type-id='type-id-76'/>
       <parameter type-id='type-id-105'/>
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-217'/>
       <return type-id='type-id-76'/>
     </function-decl>
 
 
 
-    <typedef-decl name='__clock_t' type-id='type-id-39' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-220'/>
-    <typedef-decl name='clock_t' type-id='type-id-220' filepath='/usr/include/time.h' line='59' column='1' id='type-id-221'/>
+    <typedef-decl name='__clock_t' type-id='type-id-39' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='135' column='1' id='type-id-218'/>
+    <typedef-decl name='clock_t' type-id='type-id-218' filepath='/usr/include/time.h' line='59' column='1' id='type-id-219'/>
     <function-decl name='clock' filepath='/usr/include/time.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-221'/>
+      <return type-id='type-id-219'/>
     </function-decl>
-    <typedef-decl name='__time_t' type-id='type-id-39' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-222'/>
-    <typedef-decl name='time_t' type-id='type-id-222' filepath='/usr/include/time.h' line='75' column='1' id='type-id-223'/>
+    <typedef-decl name='__time_t' type-id='type-id-39' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='139' column='1' id='type-id-220'/>
+    <typedef-decl name='time_t' type-id='type-id-220' filepath='/usr/include/time.h' line='75' column='1' id='type-id-221'/>
     <function-decl name='difftime' filepath='/usr/include/time.h' line='195' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-223'/>
-      <parameter type-id='type-id-223'/>
+      <parameter type-id='type-id-221'/>
+      <parameter type-id='type-id-221'/>
       <return type-id='type-id-121'/>
     </function-decl>
     <function-decl name='mktime' filepath='/usr/include/time.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-114'/>
-      <return type-id='type-id-223'/>
+      <return type-id='type-id-221'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
     <function-decl name='time' filepath='/usr/include/time.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-224'/>
-      <return type-id='type-id-223'/>
+      <parameter type-id='type-id-222'/>
+      <return type-id='type-id-221'/>
     </function-decl>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-218'/>
+      <parameter type-id='type-id-216'/>
       <return type-id='type-id-35'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-225'/>
-    <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-226'/>
+    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
     <function-decl name='ctime' filepath='/usr/include/time.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-226'/>
+      <parameter type-id='type-id-224'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='gmtime' filepath='/usr/include/time.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-226'/>
+      <parameter type-id='type-id-224'/>
       <return type-id='type-id-114'/>
     </function-decl>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-226'/>
+      <parameter type-id='type-id-224'/>
       <return type-id='type-id-114'/>
     </function-decl>
     <function-decl name='strftime' filepath='/usr/include/time.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-93'/>
       <parameter type-id='type-id-76'/>
       <parameter type-id='type-id-95'/>
-      <parameter type-id='type-id-219'/>
+      <parameter type-id='type-id-217'/>
       <return type-id='type-id-76'/>
     </function-decl>
     <function-decl name='strnlen' filepath='/usr/include/string.h' line='401' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3927,24 +3925,24 @@
       <parameter type-id='type-id-76'/>
       <return type-id='type-id-76'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-196'/>
-    <reference-type-def kind='rvalue' type-id='type-id-36' size-in-bits='64' id='type-id-194'/>
-    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-227'/>
-    <reference-type-def kind='lvalue' type-id='type-id-227' size-in-bits='64' id='type-id-214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-88' size-in-bits='64' id='type-id-215'/>
-    <reference-type-def kind='rvalue' type-id='type-id-196' size-in-bits='64' id='type-id-198'/>
-    <pointer-type-def type-id='type-id-203' size-in-bits='64' id='type-id-201'/>
-    <qualified-type-def type-id='type-id-190' const='yes' id='type-id-228'/>
-    <reference-type-def kind='lvalue' type-id='type-id-228' size-in-bits='64' id='type-id-202'/>
-    <pointer-type-def type-id='type-id-207' size-in-bits='64' id='type-id-206'/>
-    <qualified-type-def type-id='type-id-204' const='yes' id='type-id-229'/>
-    <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-205'/>
-    <reference-type-def kind='lvalue' type-id='type-id-179' size-in-bits='64' id='type-id-189'/>
-    <reference-type-def kind='lvalue' type-id='type-id-208' size-in-bits='64' id='type-id-212'/>
-    <reference-type-def kind='lvalue' type-id='type-id-94' size-in-bits='64' id='type-id-209'/>
-    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-210'/>
-    <reference-type-def kind='lvalue' type-id='type-id-164' size-in-bits='64' id='type-id-211'/>
-    <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-199'/>
+    <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-194'/>
+    <reference-type-def kind='rvalue' type-id='type-id-36' size-in-bits='64' id='type-id-192'/>
+    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-225'/>
+    <reference-type-def kind='lvalue' type-id='type-id-225' size-in-bits='64' id='type-id-212'/>
+    <reference-type-def kind='lvalue' type-id='type-id-88' size-in-bits='64' id='type-id-213'/>
+    <reference-type-def kind='rvalue' type-id='type-id-194' size-in-bits='64' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-201' size-in-bits='64' id='type-id-199'/>
+    <qualified-type-def type-id='type-id-188' const='yes' id='type-id-226'/>
+    <reference-type-def kind='lvalue' type-id='type-id-226' size-in-bits='64' id='type-id-200'/>
+    <pointer-type-def type-id='type-id-205' size-in-bits='64' id='type-id-204'/>
+    <qualified-type-def type-id='type-id-202' const='yes' id='type-id-227'/>
+    <pointer-type-def type-id='type-id-227' size-in-bits='64' id='type-id-203'/>
+    <reference-type-def kind='lvalue' type-id='type-id-177' size-in-bits='64' id='type-id-187'/>
+    <reference-type-def kind='lvalue' type-id='type-id-206' size-in-bits='64' id='type-id-210'/>
+    <reference-type-def kind='lvalue' type-id='type-id-94' size-in-bits='64' id='type-id-207'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-208'/>
+    <reference-type-def kind='lvalue' type-id='type-id-164' size-in-bits='64' id='type-id-209'/>
+    <reference-type-def kind='lvalue' type-id='type-id-36' size-in-bits='64' id='type-id-197'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/compressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
@@ -3977,27 +3975,27 @@
           <member-function access='private'>
             <function-decl name='destroy_impl' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12destroy_implEN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <parameter type-id='type-id-230'/>
+              <parameter type-id='type-id-228'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='is_initialized' mangled-name='_ZNK5boost15optional_detail13optional_baseIN5mongo12FTDCBSONUtil8FTDCTypeEE14is_initializedEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='468' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-231' is-artificial='yes'/>
+              <parameter type-id='type-id-229' is-artificial='yes'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
         </class-decl>
         <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1'>
           <member-type access='public'>
-            <typedef-decl name='reference_type' type-id='type-id-233' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-232'/>
+            <typedef-decl name='reference_type' type-id='type-id-231' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='150' column='1' id='type-id-230'/>
           </member-type>
         </class-decl>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1'>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseISt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS4_EEEC2EOS8_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='292' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <parameter type-id='type-id-234'/>
+              <parameter type-id='type-id-232'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -4018,18 +4016,18 @@
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'>
         <member-type access='private'>
-          <typedef-decl name='reference_type' type-id='type-id-232' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-235'/>
+          <typedef-decl name='reference_type' type-id='type-id-230' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='774' column='1' id='type-id-233'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZN5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEE3getEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1025' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-7' is-artificial='yes'/>
-            <return type-id='type-id-235'/>
+            <return type-id='type-id-233'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNR5boost8optionalIN5mongo12FTDCBSONUtil8FTDCTypeEEdeEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='1042' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-7' is-artificial='yes'/>
-            <return type-id='type-id-235'/>
+            <return type-id='type-id-233'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -4048,12 +4046,12 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-237' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='229' column='1' id='type-id-236'/>
+          <typedef-decl name='reference' type-id='type-id-235' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='229' column='1' id='type-id-234'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt6thread4swapERS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1194' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
+            <parameter type-id='type-id-197'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4061,7 +4059,7 @@
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-47'/>
-            <return type-id='type-id-236'/>
+            <return type-id='type-id-234'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -4071,21 +4069,21 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-238' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-236' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;unsigned long&gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-238'/>
+          <typedef-decl name='rebind_alloc&lt;unsigned long&gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-236'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-41' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-239'/>
+          <typedef-decl name='value_type' type-id='type-id-41' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='447' column='1' id='type-id-237'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
             <member-function access='public'>
               <function-decl name='_M_swap_data' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EE12_Vector_impl12_M_swap_dataERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
-                <parameter type-id='type-id-241'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
+                <parameter type-id='type-id-239'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -4102,7 +4100,7 @@
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='617' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4111,14 +4109,14 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2EOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='367' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm1EJN5mongo14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IS2_JRS3_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
+            <parameter type-id='type-id-240'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4127,7 +4125,7 @@
           <function-decl name='_Tuple_impl&lt;mongo::ConstDataRange &amp;, mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IRS1_JS3_RS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-84'/>
-            <parameter type-id='type-id-242'/>
+            <parameter type-id='type-id-240'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4138,7 +4136,7 @@
           <function-decl name='tuple&lt;mongo::ConstDataRange &amp;, mongo::FTDCCompressor::CompressorState, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo14ConstDataRangeENS0_14FTDCCompressor15CompressorStateENS0_6Date_tEEEC2IJRS1_S3_RS4_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-84'/>
-            <parameter type-id='type-id-242'/>
+            <parameter type-id='type-id-240'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4146,7 +4144,7 @@
         <member-function access='private'>
           <function-decl name='_Head_base&lt;mongo::FTDCCompressor::CompressorState&gt;' mangled-name='_ZNSt10_Head_baseILm1EN5mongo14FTDCCompressor15CompressorStateELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-242'/>
+            <parameter type-id='type-id-240'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4160,7 +4158,7 @@
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator bool' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEcvbEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4178,8 +4176,8 @@
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt10unique_ptrIN5mongo15FTDCFileManagerESt14default_deleteIS1_EEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
-            <return type-id='type-id-199'/>
+            <parameter type-id='type-id-192'/>
+            <return type-id='type-id-197'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -4197,25 +4195,25 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_default_n&lt;unsigned long *, unsigned long&gt;' mangled-name='_ZNSt27__uninitialized_default_n_1ILb1EE18__uninit_default_nIPmmEET_S3_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='535' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-243'/>
+            <parameter type-id='type-id-241'/>
             <parameter type-id='type-id-41'/>
-            <return type-id='type-id-243'/>
+            <return type-id='type-id-241'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_m&lt;unsigned long&gt;' mangled-name='_ZNSt11__copy_moveILb1ELb1ESt26random_access_iterator_tagE8__copy_mImEEPT_PKS3_S6_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='373' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-244'/>
-            <parameter type-id='type-id-244'/>
-            <parameter type-id='type-id-243'/>
-            <return type-id='type-id-243'/>
+            <parameter type-id='type-id-242'/>
+            <parameter type-id='type-id-242'/>
+            <parameter type-id='type-id-241'/>
+            <return type-id='type-id-241'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;unsigned long *&gt;, unsigned long *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb1EE13__uninit_copyISt13move_iteratorIPmES3_EET0_T_S6_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-243'/>
-            <return type-id='type-id-243'/>
+            <parameter type-id='type-id-241'/>
+            <return type-id='type-id-241'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -4252,7 +4250,7 @@
         <member-function access='public'>
           <function-decl name='BSONObj' mangled-name='_ZN5mongo7BSONObjC2ERKS0_' filepath='src/mongo/bson/bsonobj.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4270,7 +4268,7 @@
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIbE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <return type-id='type-id-233'/>
+            <return type-id='type-id-231'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
@@ -4294,7 +4292,7 @@
         <member-function access='public'>
           <function-decl name='Status' mangled-name='_ZN5mongo6StatusC2ERKS0_' filepath='src/mongo/base/status.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4319,7 +4317,7 @@
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithISt5tupleIJNS_14ConstDataRangeENS_6Date_tEEEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <return type-id='type-id-199'/>
+            <return type-id='type-id-197'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -4331,16 +4329,16 @@
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='getArrayOffset' mangled-name='_ZN5mongo14FTDCCompressor14getArrayOffsetEjjj' filepath='src/mongo/db/ftdc/compressor.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-245'/>
-            <parameter type-id='type-id-245'/>
-            <parameter type-id='type-id-245'/>
+            <parameter type-id='type-id-243'/>
+            <parameter type-id='type-id-243'/>
+            <parameter type-id='type-id-243'/>
             <return type-id='type-id-76'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='addSample' mangled-name='_ZN5mongo14FTDCCompressor9addSampleERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/compressor.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressor9addSampleERKNS_7BSONObjENS_6Date_tE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -4348,7 +4346,7 @@
         <member-function access='private'>
           <function-decl name='_reset' mangled-name='_ZN5mongo14FTDCCompressor6_resetERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/compressor.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCCompressor6_resetERKNS_7BSONObjENS_6Date_tE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4377,9 +4375,9 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIjvE11unsafeStoreERKjPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-246'/>
+                <parameter type-id='type-id-244'/>
                 <parameter type-id='type-id-35'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -4416,26 +4414,26 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;unsigned int&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIjEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-246'/>
+            <parameter type-id='type-id-244'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIjEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='store&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo8DataType5storeINS_10FTDCVarIntEEENS_6StatusERKT_PcmPml' filepath='src/mongo/base/data_type.h' line='144' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-35'/>
             <parameter type-id='type-id-76'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -4456,14 +4454,14 @@
         <member-function access='public'>
           <function-decl name='FTDCVarInt' mangled-name='_ZN5mongo10FTDCVarIntC2Em' filepath='src/mongo/db/ftdc/varint.h' line='53' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-247'/>
+            <parameter type-id='type-id-245'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;unsigned int&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIjEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-42'/>
             <return type-id='type-id-84'/>
           </function-decl>
@@ -4496,7 +4494,7 @@
         <member-function access='public'>
           <function-decl name='_getSerializedSize&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo11DataBuilder18_getSerializedSizeINS_10FTDCVarIntEEEmRKT_' filepath='src/mongo/base/data_builder.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <return type-id='type-id-42'/>
           </function-decl>
         </member-function>
@@ -4510,7 +4508,7 @@
         <member-function access='public'>
           <function-decl name='writeAndAdvance&lt;mongo::FTDCVarInt&gt;' mangled-name='_ZN5mongo11DataBuilder15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_' filepath='src/mongo/base/data_builder.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo11DataBuilder15writeAndAdvanceINS_10FTDCVarIntEEENS_6StatusERKT_'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
@@ -4534,8 +4532,8 @@
         <member-function access='public'>
           <function-decl name='DataRange' mangled-name='_ZN5mongo9DataRangeC2EPcS1_l' filepath='src/mongo/base/data_range.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-213'/>
-            <parameter type-id='type-id-213'/>
+            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-211'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4554,8 +4552,8 @@
     </namespace-decl>
     <namespace-decl name='mpl_'>
 
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-248' visibility='default' is-declaration-only='yes' id='type-id-249'/>
-      <typedef-decl name='false_' type-id='type-id-249' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-248'/>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-246' visibility='default' is-declaration-only='yes' id='type-id-247'/>
+      <typedef-decl name='false_' type-id='type-id-247' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='25' column='1' id='type-id-246'/>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'/>
@@ -4564,10 +4562,10 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-89'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-239' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-250'/>
+          <typedef-decl name='value_type' type-id='type-id-237' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='103' column='1' id='type-id-248'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-251' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='109' column='1' id='type-id-237'/>
+          <typedef-decl name='reference' type-id='type-id-249' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='109' column='1' id='type-id-235'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'/>
@@ -4575,22 +4573,22 @@
 
 
 
-    <typedef-decl name='is_not_reference_tag' type-id='type-id-248' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-230'/>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-252'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-231'/>
-    <reference-type-def kind='lvalue' type-id='type-id-11' size-in-bits='64' id='type-id-233'/>
-    <reference-type-def kind='rvalue' type-id='type-id-1' size-in-bits='64' id='type-id-234'/>
-    <reference-type-def kind='lvalue' type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-191' size-in-bits='64' id='type-id-240'/>
-    <reference-type-def kind='lvalue' type-id='type-id-191' size-in-bits='64' id='type-id-241'/>
-    <typedef-decl name='uint32_t' type-id='type-id-55' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-245'/>
-    <reference-type-def kind='rvalue' type-id='type-id-74' size-in-bits='64' id='type-id-242'/>
-    <qualified-type-def type-id='type-id-55' const='yes' id='type-id-253'/>
-    <reference-type-def kind='lvalue' type-id='type-id-253' size-in-bits='64' id='type-id-246'/>
-    <typedef-decl name='uint64_t' type-id='type-id-41' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-247'/>
-    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-243'/>
-    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-244'/>
+    <typedef-decl name='is_not_reference_tag' type-id='type-id-246' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='219' column='1' id='type-id-228'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-229'/>
+    <reference-type-def kind='lvalue' type-id='type-id-11' size-in-bits='64' id='type-id-231'/>
+    <reference-type-def kind='rvalue' type-id='type-id-1' size-in-bits='64' id='type-id-232'/>
+    <reference-type-def kind='lvalue' type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-238'/>
+    <reference-type-def kind='lvalue' type-id='type-id-189' size-in-bits='64' id='type-id-239'/>
+    <typedef-decl name='uint32_t' type-id='type-id-55' filepath='/usr/include/stdint.h' line='51' column='1' id='type-id-243'/>
+    <reference-type-def kind='rvalue' type-id='type-id-74' size-in-bits='64' id='type-id-240'/>
+    <qualified-type-def type-id='type-id-55' const='yes' id='type-id-251'/>
+    <reference-type-def kind='lvalue' type-id='type-id-251' size-in-bits='64' id='type-id-244'/>
+    <typedef-decl name='uint64_t' type-id='type-id-41' filepath='/usr/include/stdint.h' line='55' column='1' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-41' size-in-bits='64' id='type-id-241'/>
+    <qualified-type-def type-id='type-id-41' const='yes' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-242'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/controller.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
@@ -4607,18 +4605,18 @@
 
 
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-function access='public'>
             <function-decl name='empty' mangled-name='_ZNK5boost10filesystem4path5emptyEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='511' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-256' is-artificial='yes'/>
+              <parameter type-id='type-id-254' is-artificial='yes'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-258'/>
-              <return type-id='type-id-259'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
+              <return type-id='type-id-257'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -4631,19 +4629,19 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <namespace-decl name='__cxx11'>
-        <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3008' visibility='default' is-declaration-only='yes' id='type-id-260'/>
+        <class-decl name='basic_ostringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='3008' visibility='default' is-declaration-only='yes' id='type-id-258'/>
       </namespace-decl>
       <namespace-decl name='chrono'>
 
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-261'/>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-261'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-259'/>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-259'>
           <member-type access='public'>
-            <typedef-decl name='rep' type-id='type-id-39' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono' line='243' column='1' id='type-id-262'/>
+            <typedef-decl name='rep' type-id='type-id-39' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono' line='243' column='1' id='type-id-260'/>
           </member-type>
           <member-function access='public' static='yes'>
             <function-decl name='__cast&lt;long, std::ratio&lt;1, 1000000000&gt; &gt;' mangled-name='_ZNSt6chrono20__duration_cast_implINS_8durationIlSt5ratioILl1ELl1EEEES2_ILl1ELl1000000000EElLb1ELb0EE6__castIlS5_EES4_RKNS1_IT_T0_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/chrono' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-263'/>
-              <return type-id='type-id-261'/>
+              <parameter type-id='type-id-261'/>
+              <return type-id='type-id-259'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -4655,46 +4653,46 @@
 
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
             <member-function access='public'>
               <function-decl name='_Impl' mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEEC2EOSD_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
-                <parameter type-id='type-id-194'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
+                <parameter type-id='type-id-192'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' vtable-offset='2'>
               <function-decl name='_M_run' mangled-name='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEE6_M_runEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEE6_M_runEv'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes' vtable-offset='0'>
               <function-decl name='~_Impl_base' mangled-name='_ZNSt6thread10_Impl_baseD0Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread10_Impl_baseD0Ev'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes' vtable-offset='0'>
               <function-decl name='~_Impl_base' mangled-name='_ZNSt6thread10_Impl_baseD2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6thread10_Impl_baseD2Ev'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
             <member-function access='public'>
               <function-decl name='id' mangled-name='_ZNSt6thread2idC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
           </class-decl>
         </member-type>
         <member-function access='public'>
@@ -4718,14 +4716,14 @@
         <member-function access='private'>
           <function-decl name='_M_make_routine&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt6thread15_M_make_routineISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS5_EEvEEEESt10shared_ptrINS_5_ImplIT_EEEOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;&gt;' mangled-name='_ZNSt6threadC2ISt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS4_EEJEEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/thread' line='133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6threadC2ISt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS4_EEJEEEOT_DpOT0_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4733,38 +4731,38 @@
           <function-decl name='__shared_count&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EEC2INSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPSA_EEvEEEESaISJ_EJSI_EEESt19_Sp_make_shared_tagPT_RKT0_DpOT1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='609' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-240'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_swap' mangled-name='_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE2EE7_M_swapERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='685' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
+            <parameter type-id='type-id-197'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-5' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='158' column='1' id='type-id-265'/>
+          <typedef-decl name='type' type-id='type-id-5' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/type_traits' line='158' column='1' id='type-id-263'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='result_type' type-id='type-id-265' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1505' column='1' id='type-id-266'/>
+          <typedef-decl name='result_type' type-id='type-id-263' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1505' column='1' id='type-id-264'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;&gt;' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEC2IS9_JEEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1509' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind_simple' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEC2EOSB_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1514' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4772,21 +4770,21 @@
           <function-decl name='_M_invoke&lt;&gt;' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEE9_M_invokeIJEEEvSt12_Index_tupleIJXspT_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1526' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-265'/>
+            <return type-id='type-id-263'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNSt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEvEEclEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1517' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <return type-id='type-id-266'/>
+            <return type-id='type-id-264'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocator.h' line='105' column='1' id='type-id-267'/>
+              <typedef-decl name='other' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/allocator.h' line='105' column='1' id='type-id-265'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -4794,21 +4792,21 @@
           <function-decl name='shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt10shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEC2ISaISF_EJSE_EEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-267' visibility='default' is-declaration-only='yes' id='type-id-36'/>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-265' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <function-decl name='__enable_shared_from_this_helper&lt;__gnu_cxx::_Lock_policy::_S_atomic&gt;' mangled-name='_ZSt32__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEvRKSt14__shared_countIXT_EEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='862' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__enable_shared_from_this_helperILN9__gnu_cxx12_Lock_policyE2EEvRKSt14__shared_countIXT_EEz'>
-        <parameter type-id='type-id-264' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='862' column='1'/>
+        <parameter type-id='type-id-262' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='862' column='1'/>
         <parameter is-variadic='yes'/>
         <return type-id='type-id-5'/>
       </function-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-268' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-266' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <typedef-decl name='mutex_type' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='383' column='1' id='type-id-268'/>
+          <typedef-decl name='mutex_type' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='383' column='1' id='type-id-266'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='lock' mangled-name='_ZNSt11unique_lockISt5mutexE4lockEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4825,7 +4823,7 @@
         <member-function access='public'>
           <function-decl name='lock_guard' mangled-name='_ZNSt10lock_guardISt5mutexEC2ERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-269'/>
+            <parameter type-id='type-id-267'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4839,55 +4837,55 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt10unique_ptrINSt7__cxx1119basic_ostringstreamIcSt11char_traitsIcESaIcEEESt14default_deleteIS5_EEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/unique_ptr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-46' is-artificial='yes'/>
-            <return type-id='type-id-265'/>
+            <return type-id='type-id-263'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
-      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' is-declaration-only='yes' id='type-id-270'>
+      <class-decl name='basic_ostream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='2176' visibility='default' is-declaration-only='yes' id='type-id-268'>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-270' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='71' column='1' id='type-id-271'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-268' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='71' column='1' id='type-id-269'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZNSolsEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ostream' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-272' is-artificial='yes'/>
+            <parameter type-id='type-id-270' is-artificial='yes'/>
             <parameter type-id='type-id-41'/>
-            <return type-id='type-id-273'/>
+            <return type-id='type-id-271'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='ostream' type-id='type-id-270' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/iosfwd' line='141' column='1' id='type-id-274'/>
+      <typedef-decl name='ostream' type-id='type-id-268' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/iosfwd' line='141' column='1' id='type-id-272'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::FTDCController *&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEC2IJS6_EEEOS5_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1113' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-192'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EEC2EOS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='__call&lt;void, 0&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS2_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='1071' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <parameter type-id='type-id-36'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -4901,21 +4899,21 @@
         <member-function access='private'>
           <function-decl name='_Head_base&lt;mongo::FTDCController *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo14FTDCControllerELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCController *&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo14FTDCControllerEEEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCController *, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo14FTDCControllerEEEC2IJS2_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4954,7 +4952,7 @@
         <member-function access='public'>
           <function-decl name='unique_lock' mangled-name='_ZNSt11unique_lockISt5mutexEC2ERS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/mutex' line='412' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-269'/>
+            <parameter type-id='type-id-267'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -4967,16 +4965,16 @@
         <member-function access='private'>
           <function-decl name='__wait_until_impl&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt; &gt;' mangled-name='_ZNSt18condition_variable17__wait_until_implINSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEEEESt9cv_statusRSt11unique_lockISt5mutexERKNS1_10time_pointINS1_3_V212system_clockET_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/condition_variable' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <parameter type-id='type-id-263'/>
+            <parameter type-id='type-id-197'/>
+            <parameter type-id='type-id-261'/>
             <return type-id='type-id-58'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='wait_until&lt;std::chrono::duration&lt;long, std::ratio&lt;1, 1000000000&gt; &gt; &gt;' mangled-name='_ZNSt18condition_variable10wait_untilINSt6chrono8durationIlSt5ratioILl1ELl1000000000EEEEEESt9cv_statusRSt11unique_lockISt5mutexERKNS1_10time_pointINS1_3_V212system_clockET_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/condition_variable' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
-            <parameter type-id='type-id-263'/>
+            <parameter type-id='type-id-197'/>
+            <parameter type-id='type-id-261'/>
             <return type-id='type-id-58'/>
           </function-decl>
         </member-function>
@@ -4984,7 +4982,7 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-199'/>
+            <parameter type-id='type-id-197'/>
             <return type-id='type-id-84'/>
           </function-decl>
         </member-function>
@@ -4992,7 +4990,7 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
@@ -5001,21 +4999,21 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; &gt;' mangled-name='_ZNSt10_Head_baseILm0ESt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EELb0EEC2IS9_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; &gt;' mangled-name='_ZNSt11_Tuple_implILm0EJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2IS9_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='361' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; , void&gt;' mangled-name='_ZNSt5tupleIJSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS3_EEEEC2IJS9_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5023,87 +5021,87 @@
           <function-decl name='__shared_ptr&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt12__shared_ptrINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEELN9__gnu_cxx12_Lock_policyE2EEC2ISaISF_EJSE_EEESt19_Sp_make_shared_tagRKT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='1094' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-264'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-262'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-267' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='65' column='1' id='type-id-276'/>
+          <typedef-decl name='__type' type-id='type-id-265' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='65' column='1' id='type-id-274'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__allocator_type' type-id='type-id-278' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='514' column='1' id='type-id-277'/>
+          <typedef-decl name='__allocator_type' type-id='type-id-276' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='514' column='1' id='type-id-275'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Sp_counted_ptr_inplace&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EEC2IJSE_EEESG_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='517' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_ptr' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE6_M_ptrEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='555' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <return type-id='type-id-240'/>
+            <return type-id='type-id-238'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, void&gt;' mangled-name='_ZNSt12__shared_ptrINSt6thread10_Impl_baseELN9__gnu_cxx12_Lock_policyE2EEC2INS0_5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPSB_EEvEEEEvEEOS_IT_LS3_2EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='940' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, void&gt;' mangled-name='_ZNSt10shared_ptrINSt6thread10_Impl_baseEEC2INS0_5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS9_EEvEEEEvEEOS_IT_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr.h' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' vtable-offset='4'>
           <function-decl name='_M_get_deleter' mangled-name='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/shared_ptr_base.h' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt23_Sp_counted_ptr_inplaceINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEESaISF_ELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-279'/>
+            <parameter type-id='type-id-277'/>
             <return type-id='type-id-82'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='__alloc_rebind&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-276' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='76' column='1' id='type-id-278'/>
-      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-280'>
+      <typedef-decl name='__alloc_rebind&lt;std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, std::_Sp_counted_ptr_inplace&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::allocator&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;, __gnu_cxx::_Lock_policy::_S_atomic&gt; &gt;' type-id='type-id-274' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='76' column='1' id='type-id-276'/>
+      <class-decl name='type_info' visibility='default' is-declaration-only='yes' id='type-id-278'>
         <member-function access='public'>
           <function-decl name='operator==' mangled-name='_ZNKSt9type_infoeqERKS_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/typeinfo' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-281' is-artificial='yes'/>
-            <parameter type-id='type-id-279'/>
+            <parameter type-id='type-id-279' is-artificial='yes'/>
+            <parameter type-id='type-id-277'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='__result_type' type-id='type-id-5' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='506' column='1' id='type-id-282'/>
+          <typedef-decl name='__result_type' type-id='type-id-5' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='506' column='1' id='type-id-280'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__class_type' type-id='type-id-73' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='507' column='1' id='type-id-283'/>
+          <typedef-decl name='__class_type' type-id='type-id-73' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='507' column='1' id='type-id-281'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Class' type-id='type-id-283' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='554' column='1' id='type-id-284'/>
+          <typedef-decl name='_Class' type-id='type-id-281' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='554' column='1' id='type-id-282'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEE9constructISF_JSE_EEEvRSG_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
-            <parameter type-id='type-id-240'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS6_EEvEEEEEE7destroyISF_EEvRSG_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
-            <parameter type-id='type-id-240'/>
+            <parameter type-id='type-id-238'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5116,62 +5114,62 @@
         <member-function access='public'>
           <function-decl name='operator()&lt;, void&gt;' mangled-name='_ZNKSt12_Mem_fn_baseIMN5mongo14FTDCControllerEFvvELb1EEclIJEvEEvPS1_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/functional' line='599' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-46' is-artificial='yes'/>
-            <parameter type-id='type-id-285'/>
-            <return type-id='type-id-266'/>
+            <parameter type-id='type-id-283'/>
+            <return type-id='type-id-264'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-177' size-in-bits='64' id='type-id-264'/>
+    <reference-type-def kind='lvalue' type-id='type-id-175' size-in-bits='64' id='type-id-262'/>
     <namespace-decl name='mongo'>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-function access='public'>
             <function-decl name='getGlobalDomain' mangled-name='_ZN5mongo6logger10LogManager15getGlobalDomainEv' filepath='src/mongo/logger/log_manager.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
-              <return type-id='type-id-287'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
+              <return type-id='type-id-285'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-function access='public'>
             <function-decl name='stream' mangled-name='_ZN5mongo6logger16LogstreamBuilder6streamEv' filepath='src/mongo/logger/logstream_builder.h' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
-              <return type-id='type-id-288'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
+              <return type-id='type-id-286'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEPKc' filepath='src/mongo/logger/logstream_builder.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
               <parameter type-id='type-id-31'/>
-              <return type-id='type-id-289'/>
+              <return type-id='type-id-287'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/mongo/logger/logstream_builder.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
-              <parameter type-id='type-id-202'/>
-              <return type-id='type-id-289'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
+              <parameter type-id='type-id-200'/>
+              <return type-id='type-id-287'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;mongo::Status&gt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_' filepath='src/mongo/logger/logstream_builder.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo6logger16LogstreamBuilderlsINS_6StatusEEERS1_RKT_'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
-              <parameter type-id='type-id-211'/>
-              <return type-id='type-id-289'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
+              <parameter type-id='type-id-209'/>
+              <return type-id='type-id-287'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-type access='private'>
-            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-290'>
+            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-288'>
               <underlying-type type-id='type-id-20'/>
             </enum-decl>
           </member-type>
           <member-function access='public'>
             <function-decl name='LogComponent' mangled-name='_ZN5mongo6logger12LogComponentC2ENS1_5ValueE' filepath='src/mongo/logger/log_component.h' line='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
-              <parameter type-id='type-id-290'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
+              <parameter type-id='type-id-288'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -5179,19 +5177,19 @@
       </namespace-decl>
       <namespace-decl name='stdx'>
 
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-291'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-289'>
           <member-function access='public'>
             <function-decl name='thread&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt;, 0&gt;' mangled-name='_ZN5mongo4stdx6threadC2ISt5_BindIFSt7_Mem_fnIMNS_14FTDCControllerEFvvEEPS5_EEJELi0EEEOT_DpOT0_' filepath='src/mongo/stdx/thread.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-292' is-artificial='yes'/>
-              <parameter type-id='type-id-194'/>
+              <parameter type-id='type-id-290' is-artificial='yes'/>
+              <parameter type-id='type-id-192'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5mongo4stdx6threadaSEOS1_' filepath='src/mongo/stdx/thread.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-292' is-artificial='yes'/>
-              <parameter type-id='type-id-293'/>
-              <return type-id='type-id-294'/>
+              <parameter type-id='type-id-290' is-artificial='yes'/>
+              <parameter type-id='type-id-291'/>
+              <return type-id='type-id-292'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -5204,7 +5202,7 @@
         <member-function access='public'>
           <function-decl name='reason' mangled-name='_ZNK5mongo6Status6reasonB5cxx11Ev' filepath='src/mongo/base/status.h' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <return type-id='type-id-202'/>
+            <return type-id='type-id-200'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -5227,7 +5225,7 @@
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-295' visibility='default' is-declaration-only='yes' id='type-id-73'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-293' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-type access='private'>
           <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-74'>
             <underlying-type type-id='type-id-20'/>
@@ -5243,21 +5241,21 @@
         <member-function access='public'>
           <function-decl name='setPeriod' mangled-name='_ZN5mongo14FTDCController9setPeriodENS_8DurationISt5ratioILl1ELl1000EEEE' filepath='src/mongo/db/ftdc/controller.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController9setPeriodENS_8DurationISt5ratioILl1ELl1000EEEE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-295'/>
+            <parameter type-id='type-id-293'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setMaxDirectorySizeBytes' mangled-name='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm' filepath='src/mongo/db/ftdc/controller.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController24setMaxDirectorySizeBytesEm'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-247'/>
+            <parameter type-id='type-id-245'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='setMaxFileSizeBytes' mangled-name='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm' filepath='src/mongo/db/ftdc/controller.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController19setMaxFileSizeBytesEm'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-247'/>
+            <parameter type-id='type-id-245'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5278,7 +5276,7 @@
         <member-function access='public'>
           <function-decl name='setDirectory' mangled-name='_ZN5mongo14FTDCController12setDirectoryERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/controller.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCController12setDirectoryERKN5boost10filesystem4pathE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-258'/>
+            <parameter type-id='type-id-256'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
@@ -5321,7 +5319,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='Milliseconds' type-id='type-id-73' filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-295'/>
+      <typedef-decl name='Milliseconds' type-id='type-id-73' filepath='src/mongo/util/duration.h' line='52' column='1' id='type-id-293'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-function access='public'>
@@ -5349,15 +5347,15 @@
         <member-function access='public'>
           <function-decl name='construct&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;, std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEEE9constructISG_JSF_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-240'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-238'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::thread::_Impl&lt;std::_Bind_simple&lt;std::_Bind&lt;std::_Mem_fn&lt;void (mongo::FTDCController::*)()&gt; (mongo::FTDCController *)&gt; ()&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt6thread5_ImplISt12_Bind_simpleIFSt5_BindIFSt7_Mem_fnIMN5mongo14FTDCControllerEFvvEEPS7_EEvEEEEE7destroyISG_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' 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-240'/>
+            <parameter type-id='type-id-238'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5371,14 +5369,14 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [104]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA104_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-296'/>
+              <parameter type-id='type-id-294'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [36]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA36_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-297'/>
+              <parameter type-id='type-id-295'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
@@ -5392,42 +5390,40 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
+    <reference-type-def kind='lvalue' type-id='type-id-266' size-in-bits='64' id='type-id-267'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='832' id='type-id-298'>
-      <subrange length='104' type-id='type-id-165' id='type-id-299'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='832' id='type-id-296'>
+      <subrange length='104' type-id='type-id-165' id='type-id-297'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-298' const='yes' id='type-id-300'/>
-    <reference-type-def kind='lvalue' type-id='type-id-300' size-in-bits='64' id='type-id-296'/>
+    <reference-type-def kind='lvalue' type-id='type-id-296' size-in-bits='64' id='type-id-294'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='288' id='type-id-301'>
-      <subrange length='36' type-id='type-id-165' id='type-id-302'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='288' id='type-id-298'>
+      <subrange length='36' type-id='type-id-165' id='type-id-299'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-303'/>
-    <reference-type-def kind='lvalue' type-id='type-id-303' size-in-bits='64' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-255' const='yes' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-256'/>
-    <reference-type-def kind='lvalue' type-id='type-id-255' size-in-bits='64' id='type-id-259'/>
-    <pointer-type-def type-id='type-id-255' size-in-bits='64' id='type-id-257'/>
-    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-258'/>
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-287'/>
-    <reference-type-def kind='lvalue' type-id='type-id-260' size-in-bits='64' id='type-id-305'/>
-    <reference-type-def kind='lvalue' type-id='type-id-274' size-in-bits='64' id='type-id-288'/>
-    <reference-type-def kind='lvalue' type-id='type-id-286' size-in-bits='64' id='type-id-289'/>
-    <reference-type-def kind='rvalue' type-id='type-id-77' size-in-bits='64' id='type-id-275'/>
-    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
-    <reference-type-def kind='lvalue' type-id='type-id-291' size-in-bits='64' id='type-id-294'/>
-    <reference-type-def kind='rvalue' type-id='type-id-291' size-in-bits='64' id='type-id-293'/>
-    <qualified-type-def type-id='type-id-261' const='yes' id='type-id-306'/>
-    <reference-type-def kind='lvalue' type-id='type-id-306' size-in-bits='64' id='type-id-263'/>
-    <qualified-type-def type-id='type-id-280' const='yes' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-281'/>
-    <reference-type-def kind='lvalue' type-id='type-id-307' size-in-bits='64' id='type-id-279'/>
+    <reference-type-def kind='lvalue' type-id='type-id-298' size-in-bits='64' id='type-id-295'/>
+    <qualified-type-def type-id='type-id-253' const='yes' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-254'/>
+    <reference-type-def kind='lvalue' type-id='type-id-253' size-in-bits='64' id='type-id-257'/>
+    <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-255'/>
+    <reference-type-def kind='lvalue' type-id='type-id-300' size-in-bits='64' id='type-id-256'/>
     <pointer-type-def type-id='type-id-284' size-in-bits='64' id='type-id-285'/>
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-272'/>
-    <reference-type-def kind='lvalue' type-id='type-id-271' size-in-bits='64' id='type-id-273'/>
+    <reference-type-def kind='lvalue' type-id='type-id-258' size-in-bits='64' id='type-id-301'/>
+    <reference-type-def kind='lvalue' type-id='type-id-272' size-in-bits='64' id='type-id-286'/>
+    <reference-type-def kind='lvalue' type-id='type-id-284' size-in-bits='64' id='type-id-287'/>
+    <reference-type-def kind='rvalue' type-id='type-id-77' size-in-bits='64' id='type-id-273'/>
+    <pointer-type-def type-id='type-id-289' size-in-bits='64' id='type-id-290'/>
+    <reference-type-def kind='lvalue' type-id='type-id-289' size-in-bits='64' id='type-id-292'/>
+    <reference-type-def kind='rvalue' type-id='type-id-289' size-in-bits='64' id='type-id-291'/>
+    <qualified-type-def type-id='type-id-259' const='yes' id='type-id-302'/>
+    <reference-type-def kind='lvalue' type-id='type-id-302' size-in-bits='64' id='type-id-261'/>
+    <qualified-type-def type-id='type-id-278' const='yes' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-279'/>
+    <reference-type-def kind='lvalue' type-id='type-id-303' size-in-bits='64' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-283'/>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-270'/>
+    <reference-type-def kind='lvalue' type-id='type-id-269' size-in-bits='64' id='type-id-271'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/decompressor.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
@@ -5444,9 +5440,9 @@
 
       <namespace-decl name='detail'>
 
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-304'>
           <member-type access='public'>
-            <typedef-decl name='type' type-id='type-id-73' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-309'/>
+            <typedef-decl name='type' type-id='type-id-73' filepath='src/third_party/boost-1.60.0/boost/detail/reference_content.hpp' line='80' column='1' id='type-id-305'/>
           </member-type>
         </class-decl>
       </namespace-decl>
@@ -5457,7 +5453,7 @@
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1'/>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1'>
           <member-type access='private'>
-            <typedef-decl name='internal_type' type-id='type-id-309' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-310'/>
+            <typedef-decl name='internal_type' type-id='type-id-305' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='205' column='1' id='type-id-306'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='address' mangled-name='_ZN5boost15optional_detail15aligned_storageISt6vectorIN5mongo7BSONObjESaIS4_EEE7addressEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5468,13 +5464,13 @@
           <member-function access='private'>
             <function-decl name='get_object' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE10get_objectEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='726' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <return type-id='type-id-311'/>
+              <return type-id='type-id-307'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='get_impl' mangled-name='_ZN5boost15optional_detail13optional_baseISt6vectorIN5mongo7BSONObjESaIS4_EEE8get_implEv' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='711' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <return type-id='type-id-232'/>
+              <return type-id='type-id-230'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -5498,10 +5494,10 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'>
             <member-function access='public'>
               <function-decl name='_Vector_impl' mangled-name='_ZNSt12_Vector_baseImSaImEE12_Vector_implC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-240' is-artificial='yes'/>
+                <parameter type-id='type-id-238' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -5524,7 +5520,7 @@
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2EmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-42'/>
-            <parameter type-id='type-id-312'/>
+            <parameter type-id='type-id-308'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5562,7 +5558,7 @@
           <function-decl name='vector' mangled-name='_ZNSt6vectorImSaImEEC2EmRKS0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
             <parameter type-id='type-id-47'/>
-            <parameter type-id='type-id-312'/>
+            <parameter type-id='type-id-308'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5595,12 +5591,12 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='_Vector_base' mangled-name='_ZNSt12_Vector_baseIN5mongo7BSONObjESaIS1_EEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5616,20 +5612,20 @@
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-262'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo7BSONObjESaIS1_EE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-46' is-artificial='yes'/>
-            <return type-id='type-id-192'/>
+            <return type-id='type-id-190'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='vector' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEC2EOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -5670,9 +5666,9 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-313' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-309' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::BSONObj&gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-313'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::BSONObj&gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-309'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::BSONObj, mongo::BSONObj&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo7BSONObjEEE9constructIS1_JS1_EEEvRS2_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5727,19 +5723,19 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'>
             <member-function access='public' static='yes'>
               <function-decl name='load' mangled-name='_ZN5mongo8DataType7HandlerIjvE4loadEPjPKcmPml' filepath='src/mongo/base/data_type.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-314'/>
+                <parameter type-id='type-id-310'/>
                 <parameter type-id='type-id-31'/>
                 <parameter type-id='type-id-76'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <parameter type-id='type-id-40'/>
                 <return type-id='type-id-73'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIjvE10unsafeLoadEPjPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-314'/>
+                <parameter type-id='type-id-310'/>
                 <parameter type-id='type-id-31'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -5752,7 +5748,7 @@
                 <parameter type-id='type-id-77'/>
                 <parameter type-id='type-id-31'/>
                 <parameter type-id='type-id-76'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <parameter type-id='type-id-40'/>
                 <return type-id='type-id-73'/>
               </function-decl>
@@ -5816,10 +5812,10 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='load&lt;unsigned int&gt;' mangled-name='_ZN5mongo8DataType4loadIjEENS_6StatusEPT_PKcmPml' filepath='src/mongo/base/data_type.h' line='138' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-314'/>
+            <parameter type-id='type-id-310'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-76'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -5829,7 +5825,7 @@
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-76'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -5839,7 +5835,7 @@
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-76'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -5859,7 +5855,7 @@
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-76'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -5869,7 +5865,7 @@
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-76'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <parameter type-id='type-id-40'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -5904,7 +5900,7 @@
           <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-309' visibility='default' is-declaration-only='yes' id='type-id-73'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-305' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-function access='private'>
           <function-decl name='Validated' mangled-name='_ZN5mongo9ValidatedINS_7BSONObjEEC2Ev' filepath='src/mongo/base/data_type_validated.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
@@ -5966,156 +5962,156 @@
 
 
 
-    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-314'/>
-    <qualified-type-def type-id='type-id-52' const='yes' id='type-id-315'/>
-    <reference-type-def kind='lvalue' type-id='type-id-315' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-310' size-in-bits='64' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-55' size-in-bits='64' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-52' const='yes' id='type-id-311'/>
+    <reference-type-def kind='lvalue' type-id='type-id-311' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-306' size-in-bits='64' id='type-id-307'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_manager.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
 
       <namespace-decl name='filesystem'>
         <namespace-decl name='detail'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-316'>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-312'>
             <member-function access='public'>
               <function-decl name='dir_itr_imp' mangled-name='_ZN5boost10filesystem6detail11dir_itr_impC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='860' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-317' is-artificial='yes'/>
+                <parameter type-id='type-id-313' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' destructor='yes'>
               <function-decl name='~dir_itr_imp' mangled-name='_ZN5boost10filesystem6detail11dir_itr_impD2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='866' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-317' is-artificial='yes'/>
+                <parameter type-id='type-id-313' is-artificial='yes'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
           </class-decl>
         </namespace-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-type access='private'>
-            <typedef-decl name='string_type' type-id='type-id-16' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70' column='1' id='type-id-318'/>
+            <typedef-decl name='string_type' type-id='type-id-16' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='70' column='1' id='type-id-314'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-258'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='132' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2EOS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-319'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-315'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2ERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='145' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-320'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-316'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator/=' mangled-name='_ZN5boost10filesystem4pathdVERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='335' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-320'/>
-              <return type-id='type-id-259'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-316'/>
+              <return type-id='type-id-257'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator+=' mangled-name='_ZN5boost10filesystem4pathpLERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-320'/>
-              <return type-id='type-id-259'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-316'/>
+              <return type-id='type-id-257'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='swap' mangled-name='_ZN5boost10filesystem4path4swapERS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-259'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-257'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSEOS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-319'/>
-              <return type-id='type-id-259'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-315'/>
+              <return type-id='type-id-257'/>
             </function-decl>
           </member-function>
         </class-decl>
         <function-decl name='operator/' mangled-name='_ZN5boost10filesystemdvERKNS0_4pathES3_' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystemdvERKNS0_4pathES3_'>
-          <parameter type-id='type-id-258' name='lhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
-          <parameter type-id='type-id-258' name='rhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
-          <return type-id='type-id-255'/>
+          <parameter type-id='type-id-256' name='lhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
+          <parameter type-id='type-id-256' name='rhs' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='789' column='1'/>
+          <return type-id='type-id-253'/>
         </function-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-function access='private'>
             <function-decl name='equal' mangled-name='_ZNK5boost10filesystem18directory_iterator5equalERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='941' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-256' is-artificial='yes'/>
-              <parameter type-id='type-id-258'/>
+              <parameter type-id='type-id-254' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='dereference' mangled-name='_ZNK5boost10filesystem18directory_iterator11dereferenceEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='933' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-256' is-artificial='yes'/>
-              <return type-id='type-id-321'/>
+              <parameter type-id='type-id-254' is-artificial='yes'/>
+              <return type-id='type-id-317'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='increment' mangled-name='_ZN5boost10filesystem18directory_iterator9incrementEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='939' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes'>
             <function-decl name='~directory_iterator' mangled-name='_ZN5boost10filesystem18directory_iteratorD2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='909' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='directory_iterator' mangled-name='_ZN5boost10filesystem18directory_iteratorC2ERKNS0_4pathE' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='901' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem18directory_iteratorC2ERKNS0_4pathE'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-258'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-function access='public'>
             <function-decl name='directory_entry' mangled-name='_ZN5boost10filesystem15directory_entryC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='directory_entry' mangled-name='_ZN5boost10filesystem15directory_entryC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='757' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost10filesystem15directory_entryC2ERKS1_'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-258'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-function access='public'>
             <function-decl name='file_status' mangled-name='_ZN5boost10filesystem11file_statusC2Ev' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='file_status' mangled-name='_ZN5boost10filesystem11file_statusC2ERKS1_' filepath='src/third_party/boost-1.60.0/boost/filesystem/operations.hpp' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-258'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-256'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -6124,51 +6120,51 @@
 
       <namespace-decl name='iterators'>
         <namespace-decl name='detail'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-322'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-318'>
             <member-type access='private'>
-              <typedef-decl name='reference' type-id='type-id-259' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='645' column='1' id='type-id-321'/>
+              <typedef-decl name='reference' type-id='type-id-257' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='645' column='1' id='type-id-317'/>
             </member-type>
             <member-function access='public'>
               <function-decl name='operator*' mangled-name='_ZNK5boost9iterators6detail20iterator_facade_baseINS_10filesystem18directory_iteratorENS3_15directory_entryENS0_25single_pass_traversal_tagERS5_lLb0ELb0EEdeEv' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='653' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-323' is-artificial='yes'/>
-                <return type-id='type-id-321'/>
+                <parameter type-id='type-id-319' is-artificial='yes'/>
+                <return type-id='type-id-317'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='operator++' mangled-name='_ZN5boost9iterators6detail20iterator_facade_baseINS_10filesystem18directory_iteratorENS3_15directory_entryENS0_25single_pass_traversal_tagERS5_lLb0ELb0EEppEv' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='663' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-324' is-artificial='yes'/>
-                <return type-id='type-id-259'/>
+                <parameter type-id='type-id-320' is-artificial='yes'/>
+                <return type-id='type-id-257'/>
               </function-decl>
             </member-function>
           </class-decl>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-322'>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-318'>
             <member-function access='public'>
               <function-decl name='postfix_increment_proxy' mangled-name='_ZN5boost9iterators6detail23postfix_increment_proxyINS_10filesystem18directory_iteratorEEC2ERKS4_' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-324' is-artificial='yes'/>
-                <parameter type-id='type-id-258'/>
+                <parameter type-id='type-id-320' is-artificial='yes'/>
+                <parameter type-id='type-id-256'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
           </class-decl>
         </namespace-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-325'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-321'>
           <member-function access='private' static='yes'>
             <function-decl name='equal&lt;boost::filesystem::directory_iterator, boost::filesystem::directory_iterator&gt;' mangled-name='_ZN5boost9iterators20iterator_core_access5equalINS_10filesystem18directory_iteratorES4_EEbRKT_RKT0_N4mpl_5bool_ILb1EEE' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='565' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-258'/>
-              <parameter type-id='type-id-258'/>
-              <parameter type-id='type-id-326'/>
+              <parameter type-id='type-id-256'/>
+              <parameter type-id='type-id-256'/>
+              <parameter type-id='type-id-322'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
             <function-decl name='dereference&lt;boost::filesystem::directory_iterator&gt;' mangled-name='_ZN5boost9iterators20iterator_core_access11dereferenceINS_10filesystem18directory_iteratorEEENT_9referenceERKS5_' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='547' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-258'/>
-              <return type-id='type-id-321'/>
+              <parameter type-id='type-id-256'/>
+              <return type-id='type-id-317'/>
             </function-decl>
           </member-function>
           <member-function access='private' static='yes'>
             <function-decl name='increment&lt;boost::filesystem::directory_iterator&gt;' mangled-name='_ZN5boost9iterators20iterator_core_access9incrementINS_10filesystem18directory_iteratorEEEvRT_' filepath='src/third_party/boost-1.60.0/boost/iterator/iterator_facade.hpp' line='553' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-259'/>
+              <parameter type-id='type-id-257'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -6180,94 +6176,94 @@
           <parameter is-variadic='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'/>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-304'/>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-304'>
           <member-function access='public' destructor='yes'>
             <function-decl name='~shared_count' mangled-name='_ZN5boost6detail12shared_countD2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='471' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='shared_count' mangled-name='_ZN5boost6detail12shared_countC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='swap' mangled-name='_ZN5boost6detail12shared_count4swapERS1_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
-              <parameter type-id='type-id-328'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
+              <parameter type-id='type-id-324'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='shared_count&lt;boost::filesystem::detail::dir_itr_imp&gt;' mangled-name='_ZN5boost6detail12shared_countC2INS_10filesystem6detail11dir_itr_impEEEPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/shared_count.hpp' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail12shared_countC2INS_10filesystem6detail11dir_itr_impEEEPT_'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
-              <parameter type-id='type-id-317'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
+              <parameter type-id='type-id-313'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='release' mangled-name='_ZN5boost6detail15sp_counted_base7releaseEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='weak_release' mangled-name='_ZN5boost6detail15sp_counted_base12weak_releaseEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='sp_counted_base' mangled-name='_ZN5boost6detail15sp_counted_baseC2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public' destructor='yes' vtable-offset='0'>
             <function-decl name='~sp_counted_base' mangled-name='_ZN5boost6detail15sp_counted_baseD2Ev' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail15sp_counted_baseD2Ev'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='3'>
             <function-decl name='destroy' mangled-name='_ZN5boost6detail15sp_counted_base7destroyEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_base_clang.hpp' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail15sp_counted_base7destroyEv'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='dispose' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE7disposeEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE7disposeEv'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-308'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-304'>
           <member-function access='public'>
             <function-decl name='sp_counted_impl_p' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEEC2EPS4_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
-              <parameter type-id='type-id-317'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
+              <parameter type-id='type-id-313'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='4'>
             <function-decl name='get_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE11get_deleterERKSt9type_info' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE11get_deleterERKSt9type_info'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
-              <parameter type-id='type-id-329'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
+              <parameter type-id='type-id-325'/>
               <return type-id='type-id-82'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='5'>
             <function-decl name='get_untyped_deleter' mangled-name='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE19get_untyped_deleterEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/detail/sp_counted_impl.hpp' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost6detail17sp_counted_impl_pINS_10filesystem6detail11dir_itr_impEE19get_untyped_deleterEv'>
-              <parameter type-id='type-id-327' is-artificial='yes'/>
+              <parameter type-id='type-id-323' is-artificial='yes'/>
               <return type-id='type-id-82'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='sp_typeinfo' type-id='type-id-330' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-331'/>
+        <typedef-decl name='sp_typeinfo' type-id='type-id-326' filepath='src/third_party/boost-1.60.0/boost/detail/sp_typeinfo.hpp' line='28' column='1' id='type-id-327'/>
       </namespace-decl>
 
 
@@ -6278,31 +6274,31 @@
 
 
       <namespace-decl name='system'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-332'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-328'>
           <member-type access='private'>
-            <typedef-decl name='unspecified_bool_type' type-id='type-id-130' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-333'/>
+            <typedef-decl name='unspecified_bool_type' type-id='type-id-130' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='359' column='1' id='type-id-329'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='error_code' mangled-name='_ZN5boost6system10error_codeC2Ev' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='322' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-334' is-artificial='yes'/>
+              <parameter type-id='type-id-330' is-artificial='yes'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator void (*)()' mangled-name='_ZNK5boost6system10error_codecvPFvvEEv' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='362' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-335' is-artificial='yes'/>
-              <return type-id='type-id-333'/>
+              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <return type-id='type-id-329'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='message' mangled-name='_ZNK5boost6system10error_code7messageB5cxx11Ev' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-335' is-artificial='yes'/>
-              <return type-id='type-id-190'/>
+              <parameter type-id='type-id-331' is-artificial='yes'/>
+              <return type-id='type-id-188'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='value' mangled-name='_ZNK5boost6system10error_code5valueEv' filepath='src/third_party/boost-1.60.0/boost/system/error_code.hpp' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-335' is-artificial='yes'/>
+              <parameter type-id='type-id-331' is-artificial='yes'/>
               <return type-id='type-id-83'/>
             </function-decl>
           </member-function>
@@ -6316,7 +6312,7 @@
           <member-function access='protected'>
             <function-decl name='assign' mangled-name='_ZN5boost15optional_detail13optional_baseIbE6assignEOS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <parameter type-id='type-id-234'/>
+              <parameter type-id='type-id-232'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -6324,39 +6320,39 @@
             <function-decl name='assign_value' mangled-name='_ZN5boost15optional_detail13optional_baseIbE12assign_valueEObN4mpl_5bool_ILb0EEE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='700' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
               <parameter type-id='type-id-2'/>
-              <parameter type-id='type-id-230'/>
+              <parameter type-id='type-id-228'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='core'>
-        <typedef-decl name='typeinfo' type-id='type-id-280' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-330'/>
+        <typedef-decl name='typeinfo' type-id='type-id-278' filepath='src/third_party/boost-1.60.0/boost/core/typeinfo.hpp' line='134' column='1' id='type-id-326'/>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'>
         <member-type access='private'>
-          <typedef-decl name='element_type' type-id='type-id-309' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-336'/>
+          <typedef-decl name='element_type' type-id='type-id-305' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='345' column='1' id='type-id-332'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='get' mangled-name='_ZNK5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEE3getEv' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-10' is-artificial='yes'/>
-            <return type-id='type-id-337'/>
+            <return type-id='type-id-333'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shared_ptr&lt;boost::filesystem::detail::dir_itr_imp&gt;' mangled-name='_ZN5boost10shared_ptrINS_10filesystem6detail11dir_itr_impEEC2IS3_EEPT_' filepath='src/third_party/boost-1.60.0/boost/smart_ptr/shared_ptr.hpp' line='360' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-7' is-artificial='yes'/>
-            <parameter type-id='type-id-317'/>
+            <parameter type-id='type-id-313'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'/>
     </namespace-decl>
-    <reference-type-def kind='rvalue' type-id='type-id-255' size-in-bits='64' id='type-id-319'/>
+    <reference-type-def kind='rvalue' type-id='type-id-253' size-in-bits='64' id='type-id-315'/>
     <namespace-decl name='std'>
 
 
@@ -6367,28 +6363,28 @@
 
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-338'/>
+          <typedef-decl name='difference_type' type-id='type-id-40' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator_base_types.h' line='182' column='1' id='type-id-334'/>
         </member-type>
       </class-decl>
       <function-decl name='__introsort_loop&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, long, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElNS0_5__ops15_Iter_less_iterEEvT_SC_T0_T1_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElNS0_5__ops15_Iter_less_iterEEvT_SC_T0_T1_'>
         <parameter type-id='type-id-88' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1935' column='1'/>
         <parameter type-id='type-id-88' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1936' column='1'/>
         <parameter type-id='type-id-39' name='__depth_limit' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1937' column='1'/>
-        <parameter type-id='type-id-339' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1937' column='1'/>
+        <parameter type-id='type-id-335' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1937' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__make_heap&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt11__make_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_'>
         <parameter type-id='type-id-88' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
         <parameter type-id='type-id-88' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
-        <parameter type-id='type-id-339' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='318' column='1'/>
+        <parameter type-id='type-id-335' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='318' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__adjust_heap&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, long, boost::filesystem::path, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElS4_NS0_5__ops15_Iter_less_iterEEvT_T0_SD_T1_T2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEElS4_NS0_5__ops15_Iter_less_iterEEvT_T0_SD_T1_T2_'>
         <parameter type-id='type-id-88' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1'/>
         <parameter type-id='type-id-39' name='__holeIndex' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='207' column='1'/>
         <parameter type-id='type-id-39' name='__len' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
-        <parameter type-id='type-id-255' name='__value' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
-        <parameter type-id='type-id-339' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
+        <parameter type-id='type-id-253' name='__value' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
+        <parameter type-id='type-id-335' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='208' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__move_median_to_first&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt22__move_median_to_firstIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_SC_SC_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__move_median_to_firstIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_SC_SC_T0_'>
@@ -6396,115 +6392,115 @@
         <parameter type-id='type-id-88' name='__a' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
         <parameter type-id='type-id-88' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='78' column='1'/>
         <parameter type-id='type-id-88' name='__c' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
-        <parameter type-id='type-id-339' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
+        <parameter type-id='type-id-335' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='79' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__insertion_sort&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Iter_less_iter&gt;' mangled-name='_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1835' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops15_Iter_less_iterEEvT_SC_T0_'>
         <parameter type-id='type-id-88' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
         <parameter type-id='type-id-88' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='317' column='1'/>
-        <parameter type-id='type-id-339' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='318' column='1'/>
+        <parameter type-id='type-id-335' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_heap.h' line='318' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <function-decl name='__unguarded_linear_insert&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__ops::_Val_less_iter&gt;' mangled-name='_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops14_Val_less_iterEEvT_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS4_SaIS4_EEEENS0_5__ops14_Val_less_iterEEvT_T0_'>
         <parameter type-id='type-id-88' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1816' column='1'/>
-        <parameter type-id='type-id-339' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1817' column='1'/>
+        <parameter type-id='type-id-335' name='__comp' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algo.h' line='1817' column='1'/>
         <return type-id='type-id-5'/>
       </function-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;char&gt;' type-id='type-id-188' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-340'/>
+          <typedef-decl name='rebind_alloc&lt;char&gt;' type-id='type-id-186' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-336'/>
         </member-type>
       </class-decl>
-      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' is-declaration-only='yes' id='type-id-188'/>
+      <class-decl name='allocator&lt;char&gt;' size-in-bits='8' visibility='default' is-declaration-only='yes' id='type-id-186'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='char_type' type-id='type-id-85' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='235' column='1' id='type-id-341'/>
+          <typedef-decl name='char_type' type-id='type-id-85' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='235' column='1' id='type-id-337'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='assign' mangled-name='_ZNSt11char_traitsIcE6assignERcRKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-342'/>
-            <parameter type-id='type-id-343'/>
+            <parameter type-id='type-id-338'/>
+            <parameter type-id='type-id-339'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='copy' mangled-name='_ZNSt11char_traitsIcE4copyEPcPKcm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-344'/>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-340'/>
+            <parameter type-id='type-id-341'/>
             <parameter type-id='type-id-42'/>
-            <return type-id='type-id-344'/>
+            <return type-id='type-id-340'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='length' mangled-name='_ZNSt11char_traitsIcE6lengthEPKc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/char_traits.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-345'/>
+            <parameter type-id='type-id-341'/>
             <return type-id='type-id-42'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-346' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-anonymous='yes' naming-typedef-id='type-id-342' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='235' column='1' id='type-id-346'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='235' column='1' id='type-id-342'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE12emplace_backIJS6_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE19_M_emplace_back_auxIJS6_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEESaIS6_EE19_M_emplace_back_auxIJS6_EEEvDpOT_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;boost::filesystem::path&gt;' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE12emplace_backIJS2_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-319'/>
+            <parameter type-id='type-id-315'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rbegin' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE6rbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='583' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <return type-id='type-id-346'/>
+            <return type-id='type-id-342'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;boost::filesystem::path&gt;' mangled-name='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5boost10filesystem4pathESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-319'/>
+            <parameter type-id='type-id-315'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_ofstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default' is-declaration-only='yes' id='type-id-347'>
+      <class-decl name='basic_ofstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4096' visibility='default' is-declaration-only='yes' id='type-id-343'>
         <member-function access='public'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='778' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-348' is-artificial='yes'/>
+            <parameter type-id='type-id-344' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE5closeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='839' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-348' is-artificial='yes'/>
+            <parameter type-id='type-id-344' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='799' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-348' is-artificial='yes'/>
+            <parameter type-id='type-id-344' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-349'/>
+            <parameter type-id='type-id-345'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='737' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-348' is-artificial='yes'/>
+            <parameter type-id='type-id-344' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -6521,42 +6517,42 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;boost::filesystem::path *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5boost10filesystem4pathEEEvT_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-257'/>
-            <parameter type-id='type-id-257'/>
+            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-255'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-350' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-346' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-350'/>
+          <typedef-decl name='rebind_alloc&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-346'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt;, std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZNSt16allocator_traitsISaISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS1_7BSONObjENS1_6Date_tEEEEE9constructIS6_JS6_EEEvRS7_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
             <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-351' visibility='default' is-declaration-only='yes' id='type-id-36'>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-347' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;boost::filesystem::path&gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-351'/>
+          <typedef-decl name='rebind_alloc&lt;boost::filesystem::path&gt;' type-id='type-id-36' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='477' column='1' id='type-id-347'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;boost::filesystem::path, boost::filesystem::path&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5boost10filesystem4pathEEE9constructIS2_JS2_EEEvRS3_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
-            <parameter type-id='type-id-257'/>
-            <parameter type-id='type-id-319'/>
+            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-315'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -6565,37 +6561,37 @@
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCFileManager *&gt;' mangled-name='_ZNSt10_Head_baseILm0EPN5mongo15FTDCFileManagerELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
+            <parameter type-id='type-id-273'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCFileManager *, std::default_delete&lt;mongo::FTDCFileManager&gt; , void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo15FTDCFileManagerESt14default_deleteIS1_EEEC2IS2_JS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-273'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCFileManager *, std::default_delete&lt;mongo::FTDCFileManager&gt;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo15FTDCFileManagerESt14default_deleteIS1_EEEC2IS2_S4_vEEOT_OT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='612' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-275'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-273'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCBSONUtil::FTDCType &amp;, mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2IRS2_JS3_RS4_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-352'/>
+            <parameter type-id='type-id-348'/>
             <parameter type-id='type-id-3'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
@@ -6604,7 +6600,7 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCBSONUtil::FTDCType &amp;, mongo::BSONObj, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS0_7BSONObjENS0_6Date_tEEEC2IJRS2_S3_RS4_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-352'/>
+            <parameter type-id='type-id-348'/>
             <parameter type-id='type-id-3'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
@@ -6614,21 +6610,21 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJRKN5mongo7BSONObjENS0_6Date_tEEE7_M_headERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-199'/>
-            <return type-id='type-id-211'/>
+            <parameter type-id='type-id-197'/>
+            <return type-id='type-id-209'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType &amp;&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IRS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-352'/>
+            <parameter type-id='type-id-348'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Head_base&lt;mongo::FTDCBSONUtil::FTDCType&gt;' mangled-name='_ZNSt10_Head_baseILm0EN5mongo12FTDCBSONUtil8FTDCTypeELb0EEC2IS2_EEOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-353'/>
+            <parameter type-id='type-id-349'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -6636,20 +6632,20 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='public'>
-          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
@@ -6659,8 +6655,8 @@
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;boost::filesystem::path *&gt;, boost::filesystem::path *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5boost10filesystem4pathEES6_EET0_T_S9_S8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-36'/>
-            <parameter type-id='type-id-257'/>
-            <return type-id='type-id-257'/>
+            <parameter type-id='type-id-255'/>
+            <return type-id='type-id-255'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
@@ -6675,20 +6671,20 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-function access='public' static='yes'>
           <function-decl name='__copy_move_b&lt;boost::filesystem::path *, boost::filesystem::path *&gt;' mangled-name='_ZNSt20__copy_move_backwardILb1ELb0ESt26random_access_iterator_tagE13__copy_move_bIPN5boost10filesystem4pathES6_EET0_T_S8_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_algobase.h' line='560' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-257'/>
-            <parameter type-id='type-id-257'/>
-            <parameter type-id='type-id-257'/>
-            <return type-id='type-id-257'/>
+            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-255'/>
+            <return type-id='type-id-255'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='__gnu_cxx'>
       <namespace-decl name='__ops'>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-339'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-335'>
           <member-function access='public'>
             <function-decl name='operator()&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, __gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt; &gt;' mangled-name='_ZNK9__gnu_cxx5__ops15_Iter_less_iterclINS_17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS6_SaIS6_EEEESB_EEbT_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-354' is-artificial='yes'/>
+              <parameter type-id='type-id-350' is-artificial='yes'/>
               <parameter type-id='type-id-88'/>
               <parameter type-id='type-id-88'/>
               <return type-id='type-id-11'/>
@@ -6696,19 +6692,19 @@
           </member-function>
           <member-function access='public'>
             <function-decl name='operator()&lt;boost::filesystem::path, __gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt; &gt;' mangled-name='_ZNK9__gnu_cxx5__ops14_Val_less_iterclIN5boost10filesystem4pathENS_17__normal_iteratorIPS5_St6vectorIS5_SaIS5_EEEEEEbRT_T0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-354' is-artificial='yes'/>
-              <parameter type-id='type-id-259'/>
+              <parameter type-id='type-id-350' is-artificial='yes'/>
+              <parameter type-id='type-id-257'/>
               <parameter type-id='type-id-88'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-339'>
+        <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-335'>
           <member-function access='public'>
             <function-decl name='operator()&lt;__gnu_cxx::__normal_iterator&lt;boost::filesystem::path *, std::vector&lt;boost::filesystem::path, std::allocator&lt;boost::filesystem::path&gt; &gt; &gt;, boost::filesystem::path&gt;' mangled-name='_ZNK9__gnu_cxx5__ops14_Iter_less_valclINS_17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS6_SaIS6_EEEES6_EEbT_RT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/predefined_ops.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-354' is-artificial='yes'/>
+              <parameter type-id='type-id-350' is-artificial='yes'/>
               <parameter type-id='type-id-88'/>
-              <parameter type-id='type-id-259'/>
+              <parameter type-id='type-id-257'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
@@ -6716,33 +6712,33 @@
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-338' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='732' column='1' id='type-id-355'/>
+          <typedef-decl name='difference_type' type-id='type-id-334' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='732' column='1' id='type-id-351'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEC2ERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-356'/>
+            <parameter type-id='type-id-352'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEplEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-357' is-artificial='yes'/>
-            <parameter type-id='type-id-355'/>
+            <parameter type-id='type-id-353' is-artificial='yes'/>
+            <parameter type-id='type-id-351'/>
             <return type-id='type-id-88'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEmiEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-357' is-artificial='yes'/>
-            <parameter type-id='type-id-355'/>
+            <parameter type-id='type-id-353' is-artificial='yes'/>
+            <parameter type-id='type-id-351'/>
             <return type-id='type-id-88'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5boost10filesystem4pathESt6vectorIS3_SaIS3_EEEmmEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <return type-id='type-id-215'/>
+            <return type-id='type-id-213'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -6757,7 +6753,7 @@
           <function-decl name='construct&lt;std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt;, std::tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj, mongo::Date_t&gt; &gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorISt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeENS2_7BSONObjENS2_6Date_tEEEE9constructIS7_JS7_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
             <parameter type-id='type-id-48'/>
-            <parameter type-id='type-id-194'/>
+            <parameter type-id='type-id-192'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -6766,8 +6762,8 @@
         <member-function access='public'>
           <function-decl name='construct&lt;boost::filesystem::path, boost::filesystem::path&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5boost10filesystem4pathEE9constructIS3_JS3_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-257'/>
-            <parameter type-id='type-id-319'/>
+            <parameter type-id='type-id-255'/>
+            <parameter type-id='type-id-315'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -6777,36 +6773,36 @@
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-257' const='yes' id='type-id-358'/>
-    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-356'/>
-    <qualified-type-def type-id='type-id-88' const='yes' id='type-id-359'/>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-357'/>
-    <qualified-type-def type-id='type-id-339' const='yes' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-354'/>
-    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-361'/>
-    <reference-type-def kind='lvalue' type-id='type-id-361' size-in-bits='64' id='type-id-320'/>
+    <qualified-type-def type-id='type-id-255' const='yes' id='type-id-354'/>
+    <reference-type-def kind='lvalue' type-id='type-id-354' size-in-bits='64' id='type-id-352'/>
+    <qualified-type-def type-id='type-id-88' const='yes' id='type-id-355'/>
+    <pointer-type-def type-id='type-id-355' size-in-bits='64' id='type-id-353'/>
+    <qualified-type-def type-id='type-id-335' const='yes' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-350'/>
+    <qualified-type-def type-id='type-id-314' const='yes' id='type-id-357'/>
+    <reference-type-def kind='lvalue' type-id='type-id-357' size-in-bits='64' id='type-id-316'/>
     <namespace-decl name='mongo'>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'/>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'/>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEm' filepath='src/mongo/logger/logstream_builder.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
               <parameter type-id='type-id-41'/>
-              <return type-id='type-id-289'/>
+              <return type-id='type-id-287'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-type access='private'>
-            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-290'>
+            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-288'>
               <underlying-type type-id='type-id-20'/>
             </enum-decl>
           </member-type>
         </class-decl>
       </namespace-decl>
       <namespace-decl name='FTDCBSONUtil'>
-        <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-362'>
+        <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-358'>
           <underlying-type type-id='type-id-20'/>
         </enum-decl>
       </namespace-decl>
@@ -6820,7 +6816,7 @@
           <function-decl name='FTDCFileManager' mangled-name='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE' filepath='src/mongo/db/ftdc/file_manager.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManagerC2EPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
             <parameter type-id='type-id-75'/>
-            <parameter type-id='type-id-258'/>
+            <parameter type-id='type-id-256'/>
             <parameter type-id='type-id-77'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -6840,9 +6836,9 @@
         <member-function access='public' static='yes'>
           <function-decl name='create' mangled-name='_ZN5mongo15FTDCFileManager6createEPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionEPNS_6ClientE' filepath='src/mongo/db/ftdc/file_manager.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager6createEPKNS_10FTDCConfigERKN5boost10filesystem4pathEPNS_23FTDCCollectorCollectionEPNS_6ClientE'>
             <parameter type-id='type-id-75'/>
-            <parameter type-id='type-id-258'/>
+            <parameter type-id='type-id-256'/>
             <parameter type-id='type-id-77'/>
-            <parameter type-id='type-id-363'/>
+            <parameter type-id='type-id-359'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
@@ -6861,13 +6857,13 @@
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithIN5boost10filesystem4pathEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <return type-id='type-id-259'/>
+            <return type-id='type-id-257'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='toString' mangled-name='_ZNK5mongo10StringData8toStringB5cxx11Ev' filepath='src/mongo/base/string_data.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <return type-id='type-id-190'/>
+            <return type-id='type-id-188'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -6880,7 +6876,7 @@
         <member-function access='public'>
           <function-decl name='generateArchiveFileName' mangled-name='_ZN5mongo15FTDCFileManager23generateArchiveFileNameERKN5boost10filesystem4pathENS_10StringDataE' filepath='src/mongo/db/ftdc/file_manager.h' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager23generateArchiveFileNameERKN5boost10filesystem4pathENS_10StringDataE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-258'/>
+            <parameter type-id='type-id-256'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -6888,37 +6884,37 @@
         <member-function access='private'>
           <function-decl name='openArchiveFile' mangled-name='_ZN5mongo15FTDCFileManager15openArchiveFileEPNS_6ClientERKN5boost10filesystem4pathERKSt6vectorISt5tupleIJNS_12FTDCBSONUtil8FTDCTypeENS_7BSONObjENS_6Date_tEEESaISE_EE' filepath='src/mongo/db/ftdc/file_manager.h' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager15openArchiveFileEPNS_6ClientERKN5boost10filesystem4pathERKSt6vectorISt5tupleIJNS_12FTDCBSONUtil8FTDCTypeENS_7BSONObjENS_6Date_tEEESaISE_EE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-363'/>
-            <parameter type-id='type-id-258'/>
-            <parameter type-id='type-id-264'/>
+            <parameter type-id='type-id-359'/>
+            <parameter type-id='type-id-256'/>
+            <parameter type-id='type-id-262'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='trimDirectory' mangled-name='_ZN5mongo15FTDCFileManager13trimDirectoryERSt6vectorIN5boost10filesystem4pathESaIS4_EE' filepath='src/mongo/db/ftdc/file_manager.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager13trimDirectoryERSt6vectorIN5boost10filesystem4pathESaIS4_EE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-199'/>
+            <parameter type-id='type-id-197'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rotate' mangled-name='_ZN5mongo15FTDCFileManager6rotateEPNS_6ClientE' filepath='src/mongo/db/ftdc/file_manager.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager6rotateEPNS_6ClientE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-363'/>
+            <parameter type-id='type-id-359'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='writeSampleAndRotateIfNeeded' mangled-name='_ZN5mongo15FTDCFileManager28writeSampleAndRotateIfNeededEPNS_6ClientERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/file_manager.h' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo15FTDCFileManager28writeSampleAndRotateIfNeededEPNS_6ClientERKNS_7BSONObjENS_6Date_tE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-363'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-359'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='Client' size-in-bits='960' visibility='default' is-declaration-only='yes' id='type-id-364'/>
+      <class-decl name='Client' size-in-bits='960' visibility='default' is-declaration-only='yes' id='type-id-360'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'>
         <member-function access='public'>
           <function-decl name='FTDCFileWriter' mangled-name='_ZN5mongo14FTDCFileWriterC2EPKNS_10FTDCConfigE' filepath='src/mongo/db/ftdc/file_writer.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriterC2EPKNS_10FTDCConfigE'>
@@ -6976,9 +6972,9 @@
     </namespace-decl>
     <namespace-decl name='mpl_'>
 
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-326' visibility='default' is-declaration-only='yes' id='type-id-249'/>
-      <typedef-decl name='true_' type-id='type-id-249' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-326'/>
-      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-249'/>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-322' visibility='default' is-declaration-only='yes' id='type-id-247'/>
+      <typedef-decl name='true_' type-id='type-id-247' filepath='src/third_party/boost-1.60.0/boost/mpl/bool_fwd.hpp' line='24' column='1' id='type-id-322'/>
+      <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-247'/>
     </namespace-decl>
 
 
@@ -6988,46 +6984,45 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [2]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA2_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-365'/>
+              <parameter type-id='type-id-361'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
-    <qualified-type-def type-id='type-id-341' const='yes' id='type-id-366'/>
-    <reference-type-def kind='lvalue' type-id='type-id-366' size-in-bits='64' id='type-id-343'/>
-    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-344'/>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-363'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-348'/>
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-334'/>
-    <qualified-type-def type-id='type-id-332' const='yes' id='type-id-367'/>
-    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-335'/>
-
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='16' id='type-id-368'>
-      <subrange length='2' type-id='type-id-165' id='type-id-369'/>
+    <reference-type-def kind='lvalue' type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
+    <qualified-type-def type-id='type-id-337' const='yes' id='type-id-362'/>
+    <reference-type-def kind='lvalue' type-id='type-id-362' size-in-bits='64' id='type-id-339'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-340'/>
+    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-359'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-330'/>
+    <qualified-type-def type-id='type-id-328' const='yes' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-331'/>
+
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='16' id='type-id-364'>
+      <subrange length='2' type-id='type-id-165' id='type-id-365'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-368' const='yes' id='type-id-370'/>
-    <reference-type-def kind='lvalue' type-id='type-id-370' size-in-bits='64' id='type-id-365'/>
-    <pointer-type-def type-id='type-id-316' size-in-bits='64' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-337'/>
-    <qualified-type-def type-id='type-id-322' const='yes' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-323'/>
-    <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-324'/>
-    <pointer-type-def type-id='type-id-308' size-in-bits='64' id='type-id-327'/>
-    <reference-type-def kind='lvalue' type-id='type-id-308' size-in-bits='64' id='type-id-328'/>
-    <reference-type-def kind='lvalue' type-id='type-id-362' size-in-bits='64' id='type-id-352'/>
-    <reference-type-def kind='rvalue' type-id='type-id-11' size-in-bits='64' id='type-id-372'/>
-    <reference-type-def kind='rvalue' type-id='type-id-362' size-in-bits='64' id='type-id-353'/>
-    <qualified-type-def type-id='type-id-331' const='yes' id='type-id-373'/>
-    <reference-type-def kind='lvalue' type-id='type-id-373' size-in-bits='64' id='type-id-329'/>
+    <reference-type-def kind='lvalue' type-id='type-id-364' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-333'/>
+    <qualified-type-def type-id='type-id-318' const='yes' id='type-id-366'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-319'/>
+    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-320'/>
+    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-323'/>
+    <reference-type-def kind='lvalue' type-id='type-id-304' size-in-bits='64' id='type-id-324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-358' size-in-bits='64' id='type-id-348'/>
+    <reference-type-def kind='rvalue' type-id='type-id-11' size-in-bits='64' id='type-id-367'/>
+    <reference-type-def kind='rvalue' type-id='type-id-358' size-in-bits='64' id='type-id-349'/>
+    <qualified-type-def type-id='type-id-327' const='yes' id='type-id-368'/>
+    <reference-type-def kind='lvalue' type-id='type-id-368' size-in-bits='64' id='type-id-325'/>
     <namespace-decl name='std'>
-      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-187'>
+      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-185'>
         <member-type access='private'>
-          <typedef-decl name='openmode' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-349'/>
+          <typedef-decl name='openmode' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-345'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -7047,14 +7042,14 @@
 
 
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-type access='private'>
-            <typedef-decl name='value_type' type-id='type-id-85' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67' column='1' id='type-id-374'/>
+            <typedef-decl name='value_type' type-id='type-id-85' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='67' column='1' id='type-id-369'/>
           </member-type>
           <member-function access='public'>
             <function-decl name='c_str' mangled-name='_ZNK5boost10filesystem4path5c_strEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='398' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-256' is-artificial='yes'/>
-              <return type-id='type-id-375'/>
+              <parameter type-id='type-id-254' is-artificial='yes'/>
+              <return type-id='type-id-370'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -7089,46 +7084,46 @@
         <parameter type-id='type-id-33' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/basic_string.tcc' line='1152' column='1'/>
         <return type-id='type-id-16'/>
       </function-decl>
-      <class-decl name='basic_ifstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default' is-declaration-only='yes' id='type-id-376'>
+      <class-decl name='basic_ifstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default' is-declaration-only='yes' id='type-id-371'>
         <member-function access='public'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE5closeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <parameter type-id='type-id-372' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='574' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <parameter type-id='type-id-372' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='595' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <parameter type-id='type-id-372' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-349'/>
+            <parameter type-id='type-id-345'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes' vtable-offset='0'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='533' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-377' is-artificial='yes'/>
+            <parameter type-id='type-id-372' is-artificial='yes'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-187'>
+      <class-decl name='ios_base' size-in-bits='1728' visibility='default' is-declaration-only='yes' id='type-id-185'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-378'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-373'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='iostate' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='398' column='1' id='type-id-71'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='openmode' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-349'/>
+          <typedef-decl name='openmode' type-id='type-id-58' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/ios_base.h' line='429' column='1' id='type-id-345'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-378'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-373'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
@@ -7153,8 +7148,8 @@
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEaSERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo7BSONObjESaIS1_EEaSERKS3_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-264'/>
-            <return type-id='type-id-199'/>
+            <parameter type-id='type-id-262'/>
+            <return type-id='type-id-197'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -7168,10 +7163,10 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
-      <class-decl name='basic_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' is-declaration-only='yes' id='type-id-379'>
+      <class-decl name='basic_filebuf&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='1920' visibility='default' is-declaration-only='yes' id='type-id-374'>
         <member-function access='public'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_filebufIcSt11char_traitsIcEE7is_openEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/fstream' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-380' is-artificial='yes'/>
+            <parameter type-id='type-id-375' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -7217,7 +7212,7 @@
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj &amp;, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJN5mongo12FTDCBSONUtil8FTDCTypeERKNS0_7BSONObjENS0_6Date_tEEEC2IS2_JRS3_RS6_EvEEOT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-353'/>
+            <parameter type-id='type-id-349'/>
             <parameter type-id='type-id-84'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
@@ -7226,7 +7221,7 @@
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::FTDCBSONUtil::FTDCType, mongo::BSONObj &amp;, mongo::Date_t &amp;, void&gt;' mangled-name='_ZNSt5tupleIJN5mongo12FTDCBSONUtil8FTDCTypeERKNS0_7BSONObjENS0_6Date_tEEEC2IJS2_RS3_RS6_EvEEDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-353'/>
+            <parameter type-id='type-id-349'/>
             <parameter type-id='type-id-84'/>
             <parameter type-id='type-id-84'/>
             <return type-id='type-id-5'/>
@@ -7277,7 +7272,7 @@
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo7BSONObjESt6vectorIS2_SaIS2_EEEC2ERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_iterator.h' line='740' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-381'/>
+            <parameter type-id='type-id-376'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7334,7 +7329,7 @@
         <member-function access='public'>
           <function-decl name='open' mangled-name='_ZN5mongo14FTDCFileWriter4openERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/file_reader.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileReader4openERKN5boost10filesystem4pathE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-258'/>
+            <parameter type-id='type-id-256'/>
             <return type-id='type-id-73'/>
           </function-decl>
         </member-function>
@@ -7353,7 +7348,7 @@
         <member-function access='public'>
           <function-decl name='getValue' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEE8getValueEv' filepath='src/mongo/base/status_with.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <return type-id='type-id-352'/>
+            <return type-id='type-id-348'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -7395,55 +7390,52 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [35]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA35_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-382'/>
+              <parameter type-id='type-id-377'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [16]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA16_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-383'/>
+              <parameter type-id='type-id-378'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [19]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA19_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-384'/>
+              <parameter type-id='type-id-379'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-376' size-in-bits='64' id='type-id-377'/>
-    <qualified-type-def type-id='type-id-374' const='yes' id='type-id-385'/>
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-375'/>
-    <qualified-type-def type-id='type-id-77' const='yes' id='type-id-386'/>
-    <reference-type-def kind='lvalue' type-id='type-id-386' size-in-bits='64' id='type-id-381'/>
-    <qualified-type-def type-id='type-id-379' const='yes' id='type-id-387'/>
-    <pointer-type-def type-id='type-id-387' size-in-bits='64' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-372'/>
+    <qualified-type-def type-id='type-id-369' const='yes' id='type-id-380'/>
+    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-370'/>
+    <qualified-type-def type-id='type-id-77' const='yes' id='type-id-381'/>
+    <reference-type-def kind='lvalue' type-id='type-id-381' size-in-bits='64' id='type-id-376'/>
+    <qualified-type-def type-id='type-id-374' const='yes' id='type-id-382'/>
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-375'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='280' id='type-id-388'>
-      <subrange length='35' type-id='type-id-165' id='type-id-389'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='280' id='type-id-383'>
+      <subrange length='35' type-id='type-id-165' id='type-id-384'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-388' const='yes' id='type-id-390'/>
-    <reference-type-def kind='lvalue' type-id='type-id-390' size-in-bits='64' id='type-id-382'/>
+    <reference-type-def kind='lvalue' type-id='type-id-383' size-in-bits='64' id='type-id-377'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='128' id='type-id-391'>
-      <subrange length='16' type-id='type-id-165' id='type-id-392'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='128' id='type-id-385'>
+      <subrange length='16' type-id='type-id-165' id='type-id-386'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-391' const='yes' id='type-id-393'/>
-    <reference-type-def kind='lvalue' type-id='type-id-393' size-in-bits='64' id='type-id-383'/>
+    <reference-type-def kind='lvalue' type-id='type-id-385' size-in-bits='64' id='type-id-378'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='152' id='type-id-394'>
-      <subrange length='19' type-id='type-id-165' id='type-id-395'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='152' id='type-id-387'>
+      <subrange length='19' type-id='type-id-165' id='type-id-388'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-394' const='yes' id='type-id-396'/>
-    <reference-type-def kind='lvalue' type-id='type-id-396' size-in-bits='64' id='type-id-384'/>
+    <reference-type-def kind='lvalue' type-id='type-id-387' size-in-bits='64' id='type-id-379'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/file_writer.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
@@ -7460,12 +7452,12 @@
 
 
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'/>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'/>
       </namespace-decl>
       <namespace-decl name='optional_detail'>
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1'>
           <member-type access='private'>
-            <typedef-decl name='argument_type' type-id='type-id-211' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-397'/>
+            <typedef-decl name='argument_type' type-id='type-id-209' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='164' column='1' id='type-id-389'/>
           </member-type>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ENS_6none_tE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7477,14 +7469,14 @@
           <member-function access='protected'>
             <function-decl name='construct' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEE9constructERKS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <parameter type-id='type-id-397'/>
+              <parameter type-id='type-id-389'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='protected'>
             <function-decl name='optional_base' mangled-name='_ZN5boost15optional_detail13optional_baseIN5mongo14ConstDataRangeEEC2ERKS3_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-4' is-artificial='yes'/>
-              <parameter type-id='type-id-397'/>
+              <parameter type-id='type-id-389'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
@@ -7493,11 +7485,11 @@
         <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-1'/>
       </namespace-decl>
       <namespace-decl name='system'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-332'/>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-328'/>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-6'>
         <member-type access='private'>
-          <typedef-decl name='argument_type' type-id='type-id-397' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-398'/>
+          <typedef-decl name='argument_type' type-id='type-id-389' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='782' column='1' id='type-id-390'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ENS_6none_tE' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='790' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7509,7 +7501,7 @@
         <member-function access='public'>
           <function-decl name='optional' mangled-name='_ZN5boost8optionalIN5mongo14ConstDataRangeEEC2ERKS2_' filepath='src/third_party/boost-1.60.0/boost/optional/optional.hpp' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-7' is-artificial='yes'/>
-            <parameter type-id='type-id-398'/>
+            <parameter type-id='type-id-390'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7535,9 +7527,9 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-type access='private'>
-            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-290'>
+            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-288'>
               <underlying-type type-id='type-id-20'/>
             </enum-decl>
           </member-type>
@@ -7575,7 +7567,7 @@
         <member-function access='public'>
           <function-decl name='writeMetadata' mangled-name='_ZN5mongo14FTDCFileWriter13writeMetadataERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/file_writer.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter13writeMetadataERKNS_7BSONObjENS_6Date_tE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -7583,7 +7575,7 @@
         <member-function access='public'>
           <function-decl name='writeSample' mangled-name='_ZN5mongo14FTDCFileWriter11writeSampleERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/file_writer.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter11writeSampleERKNS_7BSONObjENS_6Date_tE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -7591,7 +7583,7 @@
         <member-function access='private'>
           <function-decl name='flush' mangled-name='_ZN5mongo14FTDCFileWriter5flushERKN5boost8optionalINS_14ConstDataRangeEEENS_6Date_tE' filepath='src/mongo/db/ftdc/file_writer.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14FTDCFileWriter5flushERKN5boost8optionalINS_14ConstDataRangeEEENS_6Date_tE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-189'/>
+            <parameter type-id='type-id-187'/>
             <parameter type-id='type-id-73'/>
             <return type-id='type-id-73'/>
           </function-decl>
@@ -7661,7 +7653,7 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [79]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA79_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-399'/>
+              <parameter type-id='type-id-391'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
@@ -7669,36 +7661,35 @@
       </namespace-decl>
     </namespace-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='632' id='type-id-400'>
-      <subrange length='79' type-id='type-id-165' id='type-id-401'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='632' id='type-id-392'>
+      <subrange length='79' type-id='type-id-165' id='type-id-393'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-400' const='yes' id='type-id-402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-402' size-in-bits='64' id='type-id-399'/>
+    <reference-type-def kind='lvalue' type-id='type-id-392' size-in-bits='64' id='type-id-391'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/util.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
     <namespace-decl name='boost'>
 
       <namespace-decl name='filesystem'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-255'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-253'>
           <member-function access='public'>
             <function-decl name='path' mangled-name='_ZN5boost10filesystem4pathC2EPKc' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-375'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-370'/>
               <return type-id='type-id-5'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='has_extension' mangled-name='_ZNK5boost10filesystem4path13has_extensionEv' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='519' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-256' is-artificial='yes'/>
+              <parameter type-id='type-id-254' is-artificial='yes'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator=' mangled-name='_ZN5boost10filesystem4pathaSERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE' filepath='src/third_party/boost-1.60.0/boost/filesystem/path.hpp' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-257' is-artificial='yes'/>
-              <parameter type-id='type-id-320'/>
-              <return type-id='type-id-259'/>
+              <parameter type-id='type-id-255' is-artificial='yes'/>
+              <parameter type-id='type-id-316'/>
+              <return type-id='type-id-257'/>
             </function-decl>
           </member-function>
         </class-decl>
@@ -7737,26 +7728,26 @@
 
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-404' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-403'/>
+          <typedef-decl name='const_reference' type-id='type-id-395' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='230' column='1' id='type-id-394'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;unsigned int&gt;' mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJjEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-396'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;long long&gt;' mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJxEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-406'/>
+            <parameter type-id='type-id-397'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='emplace_back&lt;bool&gt;' mangled-name='_ZNSt6vectorImSaImEE12emplace_backIJbEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='936' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
+            <parameter type-id='type-id-367'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7764,27 +7755,27 @@
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorImSaImEEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-46' is-artificial='yes'/>
             <parameter type-id='type-id-47'/>
-            <return type-id='type-id-403'/>
+            <return type-id='type-id-394'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;long long&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJxEEEvDpOT_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-406'/>
+            <parameter type-id='type-id-397'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;bool&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJbEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJbEEEvDpOT_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-372'/>
+            <parameter type-id='type-id-367'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_emplace_back_aux&lt;unsigned int&gt;' mangled-name='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/stl_vector.h' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorImSaImEE19_M_emplace_back_auxIJjEEEvDpOT_'>
             <parameter type-id='type-id-48' is-artificial='yes'/>
-            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-396'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7793,24 +7784,24 @@
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, bool&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJbEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
-            <parameter type-id='type-id-243'/>
-            <parameter type-id='type-id-372'/>
+            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-367'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, long long&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJxEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
-            <parameter type-id='type-id-243'/>
-            <parameter type-id='type-id-406'/>
+            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-397'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;unsigned long, unsigned int&gt;' mangled-name='_ZNSt16allocator_traitsISaImEE9constructImJjEEEvRS0_PT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/bits/alloc_traits.h' line='529' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-53'/>
-            <parameter type-id='type-id-243'/>
-            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-396'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7818,7 +7809,7 @@
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'>
         <member-type access='private'>
-          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-191'/>
+          <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-189'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-36'/>
@@ -7829,55 +7820,55 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
       <namespace-decl name='logger'>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'/>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'/>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsENS_10StringDataE' filepath='src/mongo/logger/logstream_builder.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
               <parameter type-id='type-id-73'/>
-              <return type-id='type-id-289'/>
+              <return type-id='type-id-287'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo6logger16LogstreamBuilderlsEi' filepath='src/mongo/logger/logstream_builder.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-287' is-artificial='yes'/>
+              <parameter type-id='type-id-285' is-artificial='yes'/>
               <parameter type-id='type-id-83'/>
-              <return type-id='type-id-289'/>
+              <return type-id='type-id-287'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-286'>
+        <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-284'>
           <member-type access='private'>
-            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-290'>
+            <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-288'>
               <underlying-type type-id='type-id-20'/>
             </enum-decl>
           </member-type>
         </class-decl>
       </namespace-decl>
-      <var-decl name='kFTDCInterimFile' type-id='type-id-407' mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1' elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
-      <var-decl name='kFTDCArchiveFile' type-id='type-id-408' mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1' elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
-      <var-decl name='kFTDCIdField' type-id='type-id-409' mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1' elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
-      <var-decl name='kFTDCTypeField' type-id='type-id-410' mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1' elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
-      <var-decl name='kFTDCDataField' type-id='type-id-410' mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1' elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
-      <var-decl name='kFTDCDocField' type-id='type-id-409' mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1' elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
-      <var-decl name='kFTDCDocsField' type-id='type-id-410' mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1' elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
-      <var-decl name='kFTDCCollectStartField' type-id='type-id-411' mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1' elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
-      <var-decl name='kFTDCCollectEndField' type-id='type-id-409' mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1' elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
+      <var-decl name='kFTDCInterimFile' type-id='type-id-385' mangled-name='_ZN5mongo16kFTDCInterimFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='51' column='1' elf-symbol-id='_ZN5mongo16kFTDCInterimFileE'/>
+      <var-decl name='kFTDCArchiveFile' type-id='type-id-398' mangled-name='_ZN5mongo16kFTDCArchiveFileE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='53' column='1' elf-symbol-id='_ZN5mongo16kFTDCArchiveFileE'/>
+      <var-decl name='kFTDCIdField' type-id='type-id-399' mangled-name='_ZN5mongo12kFTDCIdFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='55' column='1' elf-symbol-id='_ZN5mongo12kFTDCIdFieldE'/>
+      <var-decl name='kFTDCTypeField' type-id='type-id-400' mangled-name='_ZN5mongo14kFTDCTypeFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='56' column='1' elf-symbol-id='_ZN5mongo14kFTDCTypeFieldE'/>
+      <var-decl name='kFTDCDataField' type-id='type-id-400' mangled-name='_ZN5mongo14kFTDCDataFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='58' column='1' elf-symbol-id='_ZN5mongo14kFTDCDataFieldE'/>
+      <var-decl name='kFTDCDocField' type-id='type-id-399' mangled-name='_ZN5mongo13kFTDCDocFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='59' column='1' elf-symbol-id='_ZN5mongo13kFTDCDocFieldE'/>
+      <var-decl name='kFTDCDocsField' type-id='type-id-400' mangled-name='_ZN5mongo14kFTDCDocsFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='61' column='1' elf-symbol-id='_ZN5mongo14kFTDCDocsFieldE'/>
+      <var-decl name='kFTDCCollectStartField' type-id='type-id-401' mangled-name='_ZN5mongo22kFTDCCollectStartFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='63' column='1' elf-symbol-id='_ZN5mongo22kFTDCCollectStartFieldE'/>
+      <var-decl name='kFTDCCollectEndField' type-id='type-id-399' mangled-name='_ZN5mongo20kFTDCCollectEndFieldE' visibility='default' filepath='src/mongo/db/ftdc/util.cpp' line='64' column='1' elf-symbol-id='_ZN5mongo20kFTDCCollectEndFieldE'/>
       <namespace-decl name='FTDCBSONUtil'>
         <function-decl name='extractMetricsFromDocument' mangled-name='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil26extractMetricsFromDocumentERKNS_7BSONObjES3_PSt6vectorImSaImEE'>
-          <parameter type-id='type-id-211' name='referenceDoc' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
-          <parameter type-id='type-id-211' name='currentDoc' filepath='src/mongo/db/ftdc/util.cpp' line='234' column='1'/>
+          <parameter type-id='type-id-209' name='referenceDoc' filepath='src/mongo/db/ftdc/util.cpp' line='233' column='1'/>
+          <parameter type-id='type-id-209' name='currentDoc' filepath='src/mongo/db/ftdc/util.cpp' line='234' column='1'/>
           <parameter type-id='type-id-48' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='235' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
 
         <function-decl name='constructDocumentFromMetrics' mangled-name='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil28constructDocumentFromMetricsERKNS_7BSONObjERKSt6vectorImSaImEE'>
-          <parameter type-id='type-id-211' name='ref' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
-          <parameter type-id='type-id-264' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
+          <parameter type-id='type-id-209' name='ref' filepath='src/mongo/db/ftdc/util.cpp' line='334' column='1'/>
+          <parameter type-id='type-id-262' name='metrics' filepath='src/mongo/db/ftdc/util.cpp' line='335' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
         <function-decl name='createBSONMetadataDocument' mangled-name='_ZN5mongo12FTDCBSONUtil26createBSONMetadataDocumentERKNS_7BSONObjENS_6Date_tE' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil26createBSONMetadataDocumentERKNS_7BSONObjENS_6Date_tE'>
-          <parameter type-id='type-id-211' name='metadata' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
+          <parameter type-id='type-id-209' name='metadata' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
           <parameter type-id='type-id-73' name='date' filepath='src/mongo/db/ftdc/util.cpp' line='346' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
@@ -7887,19 +7878,19 @@
           <return type-id='type-id-73'/>
         </function-decl>
         <function-decl name='getBSONDocumentId' mangled-name='_ZN5mongo12FTDCBSONUtil17getBSONDocumentIdERKNS_7BSONObjE' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil17getBSONDocumentIdERKNS_7BSONObjE'>
-          <parameter type-id='type-id-211' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
+          <parameter type-id='type-id-209' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
         <function-decl name='getBSONDocumentType' mangled-name='_ZN5mongo12FTDCBSONUtil19getBSONDocumentTypeERKNS_7BSONObjE' filepath='src/mongo/db/ftdc/util.cpp' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil19getBSONDocumentTypeERKNS_7BSONObjE'>
-          <parameter type-id='type-id-211' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
+          <parameter type-id='type-id-209' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
         <function-decl name='getBSONDocumentFromMetadataDoc' mangled-name='_ZN5mongo12FTDCBSONUtil30getBSONDocumentFromMetadataDocERKNS_7BSONObjE' filepath='src/mongo/db/ftdc/util.cpp' line='396' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil30getBSONDocumentFromMetadataDocERKNS_7BSONObjE'>
-          <parameter type-id='type-id-211' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
+          <parameter type-id='type-id-209' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='365' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
         <function-decl name='getMetricsFromMetricDoc' mangled-name='_ZN5mongo12FTDCBSONUtil23getMetricsFromMetricDocERKNS_7BSONObjEPNS_16FTDCDecompressorE' filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo12FTDCBSONUtil23getMetricsFromMetricDocERKNS_7BSONObjEPNS_16FTDCDecompressorE'>
-          <parameter type-id='type-id-211' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'/>
+          <parameter type-id='type-id-209' name='obj' filepath='src/mongo/db/ftdc/util.cpp' line='412' column='1'/>
           <parameter type-id='type-id-77' name='decompressor' filepath='src/mongo/db/ftdc/util.cpp' line='413' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
@@ -7910,22 +7901,22 @@
 
       <namespace-decl name='FTDCUtil'>
         <function-decl name='getInterimFile' mangled-name='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil14getInterimFileERKN5boost10filesystem4pathE'>
-          <parameter type-id='type-id-258' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
-          <return type-id='type-id-255'/>
+          <parameter type-id='type-id-256' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
+          <return type-id='type-id-253'/>
         </function-decl>
 
         <function-decl name='getInterimTempFile' mangled-name='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil18getInterimTempFileERKN5boost10filesystem4pathE'>
-          <parameter type-id='type-id-258' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
-          <return type-id='type-id-255'/>
+          <parameter type-id='type-id-256' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
+          <return type-id='type-id-253'/>
         </function-decl>
         <function-decl name='roundTime' mangled-name='_ZN5mongo8FTDCUtil9roundTimeENS_6Date_tENS_8DurationISt5ratioILl1ELl1000EEEE' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil9roundTimeENS_6Date_tENS_8DurationISt5ratioILl1ELl1000EEEE'>
           <parameter type-id='type-id-73' name='now' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
-          <parameter type-id='type-id-295' name='period' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
+          <parameter type-id='type-id-293' name='period' filepath='src/mongo/db/ftdc/util.cpp' line='93' column='1'/>
           <return type-id='type-id-73'/>
         </function-decl>
         <function-decl name='getMongoSPath' mangled-name='_ZN5mongo8FTDCUtil13getMongoSPathERKN5boost10filesystem4pathE' filepath='src/mongo/db/ftdc/util.cpp' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8FTDCUtil13getMongoSPathERKN5boost10filesystem4pathE'>
-          <parameter type-id='type-id-258' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
-          <return type-id='type-id-255'/>
+          <parameter type-id='type-id-256' name='file' filepath='src/mongo/db/ftdc/util.cpp' line='85' column='1'/>
+          <return type-id='type-id-253'/>
         </function-decl>
       </namespace-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'/>
@@ -7939,33 +7930,33 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIxvE10unsafeLoadEPxPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-412'/>
+                <parameter type-id='type-id-402'/>
                 <parameter type-id='type-id-31'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeStore' mangled-name='_ZN5mongo8DataType7HandlerIxvE11unsafeStoreERKxPcPm' filepath='src/mongo/base/data_type.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-413'/>
+                <parameter type-id='type-id-403'/>
                 <parameter type-id='type-id-35'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIyvE10unsafeLoadEPyPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-414'/>
+                <parameter type-id='type-id-404'/>
                 <parameter type-id='type-id-31'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public' static='yes'>
               <function-decl name='unsafeLoad' mangled-name='_ZN5mongo8DataType7HandlerIavE10unsafeLoadEPaPKcPm' filepath='src/mongo/base/data_type.h' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-415'/>
+                <parameter type-id='type-id-405'/>
                 <parameter type-id='type-id-31'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -7974,7 +7965,7 @@
         <member-function access='public'>
           <function-decl name='BSONObjIterator' mangled-name='_ZN5mongo15BSONObjIteratorC2ERKNS_7BSONObjE' filepath='src/mongo/bson/bsonobj.h' line='597' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7986,9 +7977,9 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeLoad&lt;long long&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIxEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-412'/>
+            <parameter type-id='type-id-402'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -7996,15 +7987,15 @@
           <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIxEEEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeLoad&lt;unsigned long long&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIyEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-414'/>
+            <parameter type-id='type-id-404'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -8012,31 +8003,31 @@
           <function-decl name='unsafeLoad&lt;mongo::LittleEndian&lt;unsigned long long&gt; &gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadINS_12LittleEndianIyEEEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeLoad&lt;signed char&gt;' mangled-name='_ZN5mongo8DataType10unsafeLoadIaEEvPT_PKcPm' filepath='src/mongo/base/data_type.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-415'/>
+            <parameter type-id='type-id-405'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;long long&gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreIxEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-413'/>
+            <parameter type-id='type-id-403'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='unsafeStore&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZN5mongo8DataType11unsafeStoreINS_12LittleEndianIxEEEEvRKT_PcPm' filepath='src/mongo/base/data_type.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-35'/>
-            <parameter type-id='type-id-210'/>
+            <parameter type-id='type-id-208'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -8047,7 +8038,7 @@
             <parameter type-id='type-id-75' is-artificial='yes'/>
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-76'/>
-            <return type-id='type-id-211'/>
+            <return type-id='type-id-209'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8062,7 +8053,7 @@
             <parameter type-id='type-id-75' is-artificial='yes'/>
             <parameter type-id='type-id-77'/>
             <parameter type-id='type-id-76'/>
-            <return type-id='type-id-211'/>
+            <return type-id='type-id-209'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8075,16 +8066,16 @@
         <member-function access='public'>
           <function-decl name='read&lt;signed char&gt;' mangled-name='_ZNK5mongo13ConstDataView4readIaEERKS0_PT_m' filepath='src/mongo/base/data_view.h' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <parameter type-id='type-id-415'/>
+            <parameter type-id='type-id-405'/>
             <parameter type-id='type-id-76'/>
-            <return type-id='type-id-211'/>
+            <return type-id='type-id-209'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='read&lt;signed char&gt;' mangled-name='_ZNK5mongo13ConstDataView4readIaEET_m' filepath='src/mongo/base/data_view.h' line='57' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
             <parameter type-id='type-id-42'/>
-            <return type-id='type-id-416'/>
+            <return type-id='type-id-406'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -8147,7 +8138,7 @@
         <member-function access='public'>
           <function-decl name='type' mangled-name='_ZNK5mongo11BSONElement4typeEv' filepath='src/mongo/bson/bsonelement.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <return type-id='type-id-417'/>
+            <return type-id='type-id-407'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -8177,7 +8168,7 @@
         <member-function access='public'>
           <function-decl name='binData' mangled-name='_ZNK5mongo11BSONElement7binDataERi' filepath='src/mongo/bson/bsonelement.h' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <parameter type-id='type-id-418'/>
+            <parameter type-id='type-id-408'/>
             <return type-id='type-id-31'/>
           </function-decl>
         </member-function>
@@ -8220,12 +8211,12 @@
         <member-function access='private'>
           <function-decl name='chk' mangled-name='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE' filepath='src/mongo/bson/bsonelement.h' line='692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo11BSONElement3chkENS_8BSONTypeE'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <parameter type-id='type-id-417'/>
-            <return type-id='type-id-211'/>
+            <parameter type-id='type-id-407'/>
+            <return type-id='type-id-209'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-417'>
+      <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-407'>
         <underlying-type type-id='type-id-20'/>
       </enum-decl>
       <class-decl name='__anonymous_struct__' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-73'>
@@ -8310,7 +8301,7 @@
             <parameter type-id='type-id-77' is-artificial='yes'/>
             <parameter type-id='type-id-73'/>
             <parameter type-id='type-id-83'/>
-            <parameter type-id='type-id-417'/>
+            <parameter type-id='type-id-407'/>
             <parameter type-id='type-id-82'/>
             <return type-id='type-id-84'/>
           </function-decl>
@@ -8335,13 +8326,13 @@
           <function-decl name='subarrayStart' mangled-name='_ZN5mongo14BSONObjBuilder13subarrayStartENS_10StringDataE' filepath='src/mongo/bson/bsonobjbuilder.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder13subarrayStartENS_10StringDataE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
             <parameter type-id='type-id-73'/>
-            <return type-id='type-id-212'/>
+            <return type-id='type-id-210'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='append' mangled-name='_ZN5mongo14BSONObjBuilder6appendERKNS_11BSONElementE' filepath='src/mongo/bson/bsonobjbuilder.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo14BSONObjBuilder6appendERKNS_11BSONElementE'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <return type-id='type-id-84'/>
           </function-decl>
         </member-function>
@@ -8356,7 +8347,7 @@
         <member-function access='public'>
           <function-decl name='write&lt;mongo::LittleEndian&lt;long long&gt; &gt;' mangled-name='_ZN5mongo8DataView5writeINS_12LittleEndianIxEEEERS0_RKT_m' filepath='src/mongo/base/data_view.h' line='82' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-211'/>
+            <parameter type-id='type-id-209'/>
             <parameter type-id='type-id-42'/>
             <return type-id='type-id-84'/>
           </function-decl>
@@ -8366,7 +8357,7 @@
         <member-function access='public'>
           <function-decl name='StatusWith' mangled-name='_ZN5mongo10StatusWithINS_12FTDCBSONUtil8FTDCTypeEEC2ES2_' filepath='src/mongo/base/status_with.h' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-362'/>
+            <parameter type-id='type-id-358'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -8382,14 +8373,14 @@
         <member-function access='public'>
           <function-decl name='operator&lt;&lt;' mangled-name='_ZN5mongo17StringBuilderImplINS_21SharedBufferAllocatorEElsENS_8BSONTypeE' filepath='src/mongo/bson/util/builder.h' line='443' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-77' is-artificial='yes'/>
-            <parameter type-id='type-id-417'/>
+            <parameter type-id='type-id-407'/>
             <return type-id='type-id-84'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='str' mangled-name='_ZNK5mongo17StringBuilderImplINS_21SharedBufferAllocatorEE3strB5cxx11Ev' filepath='src/mongo/bson/util/builder.h' line='477' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <return type-id='type-id-190'/>
+            <return type-id='type-id-188'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -8410,39 +8401,35 @@
       </class-decl>
     </namespace-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='128' id='type-id-407'>
-      <subrange length='16' type-id='type-id-165' id='type-id-392'/>
 
-    </array-type-def>
-
-    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='64' id='type-id-408'>
-      <subrange length='8' type-id='type-id-165' id='type-id-419'/>
+    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='64' id='type-id-398'>
+      <subrange length='8' type-id='type-id-165' id='type-id-409'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='32' id='type-id-409'>
-      <subrange length='4' type-id='type-id-165' id='type-id-420'/>
+    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='32' id='type-id-399'>
+      <subrange length='4' type-id='type-id-165' id='type-id-410'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='40' id='type-id-410'>
-      <subrange length='5' type-id='type-id-165' id='type-id-421'/>
+    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='40' id='type-id-400'>
+      <subrange length='5' type-id='type-id-165' id='type-id-411'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='48' id='type-id-411'>
-      <subrange length='6' type-id='type-id-165' id='type-id-422'/>
+    <array-type-def dimensions='1' type-id='type-id-94' size-in-bits='48' id='type-id-401'>
+      <subrange length='6' type-id='type-id-165' id='type-id-412'/>
 
     </array-type-def>
-    <reference-type-def kind='rvalue' type-id='type-id-55' size-in-bits='64' id='type-id-405'/>
-    <reference-type-def kind='rvalue' type-id='type-id-86' size-in-bits='64' id='type-id-406'/>
+    <reference-type-def kind='rvalue' type-id='type-id-55' size-in-bits='64' id='type-id-396'/>
+    <reference-type-def kind='rvalue' type-id='type-id-86' size-in-bits='64' id='type-id-397'/>
     <namespace-decl name='__gnu_cxx'>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'>
         <member-type access='public'>
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-89'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-423' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-404'/>
+          <typedef-decl name='const_reference' type-id='type-id-413' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/alloc_traits.h' line='110' column='1' id='type-id-395'/>
         </member-type>
       </class-decl>
       <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-88'/>
@@ -8451,31 +8438,31 @@
         <member-function access='public'>
           <function-decl name='construct&lt;unsigned long, bool&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJbEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-243'/>
-            <parameter type-id='type-id-372'/>
+            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-367'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;unsigned long, long long&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJxEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-243'/>
-            <parameter type-id='type-id-406'/>
+            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-397'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;unsigned long, unsigned int&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorImE9constructImJjEEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.0/../../../../include/c++/5.4.0/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-90' is-artificial='yes'/>
-            <parameter type-id='type-id-243'/>
-            <parameter type-id='type-id-405'/>
+            <parameter type-id='type-id-241'/>
+            <parameter type-id='type-id-396'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-250' const='yes' id='type-id-424'/>
-    <reference-type-def kind='lvalue' type-id='type-id-424' size-in-bits='64' id='type-id-423'/>
+    <qualified-type-def type-id='type-id-248' const='yes' id='type-id-414'/>
+    <reference-type-def kind='lvalue' type-id='type-id-414' size-in-bits='64' id='type-id-413'/>
 
 
 
@@ -8485,48 +8472,42 @@
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [8]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA8_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-425'/>
+              <parameter type-id='type-id-415'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;long long&gt;' mangled-name='_ZN10mongoutils3str6streamlsIxEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-413'/>
+              <parameter type-id='type-id-403'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
           <member-function access='public'>
             <function-decl name='operator&lt;&lt;&lt;char [7]&gt;' mangled-name='_ZN10mongoutils3str6streamlsIA7_cEERS1_RKT_' filepath='src/mongo/util/mongoutils/str.h' line='61' column='1' visibility='default' binding='global' size-in-bits='64'>
               <parameter type-id='type-id-158' is-artificial='yes'/>
-              <parameter type-id='type-id-426'/>
+              <parameter type-id='type-id-416'/>
               <return type-id='type-id-160'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-412'/>
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-427'/>
-    <reference-type-def kind='lvalue' type-id='type-id-427' size-in-bits='64' id='type-id-413'/>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-414'/>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-416'/>
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-415'/>
-    <reference-type-def kind='lvalue' type-id='type-id-83' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-402'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-417'/>
+    <reference-type-def kind='lvalue' type-id='type-id-417' size-in-bits='64' id='type-id-403'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-404'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-406'/>
+    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-405'/>
+    <reference-type-def kind='lvalue' type-id='type-id-83' size-in-bits='64' id='type-id-408'/>
 
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='64' id='type-id-428'>
-      <subrange length='8' type-id='type-id-165' id='type-id-419'/>
+    <reference-type-def kind='lvalue' type-id='type-id-398' size-in-bits='64' id='type-id-415'/>
 
-    </array-type-def>
-    <qualified-type-def type-id='type-id-428' const='yes' id='type-id-429'/>
-    <reference-type-def kind='lvalue' type-id='type-id-429' size-in-bits='64' id='type-id-425'/>
-
-    <array-type-def dimensions='1' type-id='type-id-85' size-in-bits='56' id='type-id-430'>
-      <subrange length='7' type-id='type-id-165' id='type-id-431'/>
+    <array-type-def dimensions='1' type-id='type-id-166' size-in-bits='56' id='type-id-418'>
+      <subrange length='7' type-id='type-id-165' id='type-id-419'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-430' const='yes' id='type-id-432'/>
-    <reference-type-def kind='lvalue' type-id='type-id-432' size-in-bits='64' id='type-id-426'/>
+    <reference-type-def kind='lvalue' type-id='type-id-418' size-in-bits='64' id='type-id-416'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='src/mongo/db/ftdc/varint.cpp' comp-dir-path='/home/andrew/Documents/10gen/dev/src/mongodb' language='LANG_C_plus_plus'>
 
@@ -8537,10 +8518,10 @@
           <class-decl name='__anonymous_struct__' is-struct='yes' is-anonymous='yes' visibility='default' is-declaration-only='yes' id='type-id-79'>
             <member-function access='public' static='yes'>
               <function-decl name='store' mangled-name='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE5storeERKS2_PcmPml' filepath='src/mongo/db/ftdc/varint.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo8DataType7HandlerINS_10FTDCVarIntEvE5storeERKS2_PcmPml'>
-                <parameter type-id='type-id-211'/>
+                <parameter type-id='type-id-209'/>
                 <parameter type-id='type-id-35'/>
                 <parameter type-id='type-id-76'/>
-                <parameter type-id='type-id-210'/>
+                <parameter type-id='type-id-208'/>
                 <parameter type-id='type-id-40'/>
                 <return type-id='type-id-73'/>
               </function-decl>
@@ -8552,7 +8533,7 @@
         <member-function access='public'>
           <function-decl name='operator unsigned long' mangled-name='_ZNK5mongo10FTDCVarIntcvmEv' filepath='src/mongo/db/ftdc/varint.h' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-75' is-artificial='yes'/>
-            <return type-id='type-id-247'/>
+            <return type-id='type-id-245'/>
           </function-decl>
         </member-function>
       </class-decl>

diff --git a/tests/data/test-read-dwarf/test12-pr18844.so.abi b/tests/data/test-read-dwarf/test12-pr18844.so.abi
index 6abee08..676ec17 100644 (file)
--- a/tests/data/test-read-dwarf/test12-pr18844.so.abi
+++ b/tests/data/test-read-dwarf/test12-pr18844.so.abi
@@ -35203,47 +35203,42 @@
     <reference-type-def kind='lvalue' type-id='type-id-3406' size-in-bits='64' id='type-id-3410'/>
     <pointer-type-def type-id='type-id-3406' size-in-bits='64' id='type-id-3408'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2555' size-in-bits='160' id='type-id-3488'>
-      <subrange length='20' type-id='type-id-2918' id='type-id-3489'/>
+    <array-type-def dimensions='1' type-id='type-id-3488' size-in-bits='160' id='type-id-3489'>
+      <subrange length='20' type-id='type-id-2918' id='type-id-3490'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-3488' const='yes' id='type-id-3490'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3490' size-in-bits='64' id='type-id-3409'/>
+    <qualified-type-def type-id='type-id-2555' const='yes' id='type-id-3488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3489' size-in-bits='64' id='type-id-3409'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2555' size-in-bits='152' id='type-id-3491'>
+    <array-type-def dimensions='1' type-id='type-id-3488' size-in-bits='152' id='type-id-3491'>
       <subrange length='19' type-id='type-id-2918' id='type-id-3492'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-3491' const='yes' id='type-id-3493'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3493' size-in-bits='64' id='type-id-3411'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3491' size-in-bits='64' id='type-id-3411'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2555' size-in-bits='176' id='type-id-3494'>
-      <subrange length='22' type-id='type-id-2918' id='type-id-3495'/>
+    <array-type-def dimensions='1' type-id='type-id-3488' size-in-bits='176' id='type-id-3493'>
+      <subrange length='22' type-id='type-id-2918' id='type-id-3494'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-3494' const='yes' id='type-id-3496'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3496' size-in-bits='64' id='type-id-3412'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3493' size-in-bits='64' id='type-id-3412'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2555' size-in-bits='120' id='type-id-3497'>
-      <subrange length='15' type-id='type-id-2918' id='type-id-3498'/>
+    <array-type-def dimensions='1' type-id='type-id-3488' size-in-bits='120' id='type-id-3495'>
+      <subrange length='15' type-id='type-id-2918' id='type-id-3496'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-3497' const='yes' id='type-id-3499'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3499' size-in-bits='64' id='type-id-3413'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3495' size-in-bits='64' id='type-id-3413'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2555' size-in-bits='64' id='type-id-3500'>
-      <subrange length='8' type-id='type-id-2918' id='type-id-3501'/>
+    <array-type-def dimensions='1' type-id='type-id-3488' size-in-bits='64' id='type-id-3497'>
+      <subrange length='8' type-id='type-id-2918' id='type-id-3498'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-3500' const='yes' id='type-id-3502'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3502' size-in-bits='64' id='type-id-3414'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3497' size-in-bits='64' id='type-id-3414'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2555' size-in-bits='56' id='type-id-3503'>
-      <subrange length='7' type-id='type-id-2918' id='type-id-3504'/>
+    <array-type-def dimensions='1' type-id='type-id-3488' size-in-bits='56' id='type-id-3499'>
+      <subrange length='7' type-id='type-id-2918' id='type-id-3500'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-3503' const='yes' id='type-id-3505'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3505' size-in-bits='64' id='type-id-3415'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3499' size-in-bits='64' id='type-id-3415'/>
     <reference-type-def kind='lvalue' type-id='type-id-4' size-in-bits='64' id='type-id-2511'/>
     <qualified-type-def type-id='type-id-56' const='yes' id='type-id-2499'/>
     <reference-type-def kind='lvalue' type-id='type-id-2499' size-in-bits='64' id='type-id-78'/>
@@ -35253,201 +35248,201 @@
     <reference-type-def kind='rvalue' type-id='type-id-2143' size-in-bits='64' id='type-id-2152'/>
     <reference-type-def kind='lvalue' type-id='type-id-2143' size-in-bits='64' id='type-id-2153'/>
     <reference-type-def kind='lvalue' type-id='type-id-2091' size-in-bits='64' id='type-id-2163'/>
-    <qualified-type-def type-id='type-id-2143' const='yes' id='type-id-3506'/>
-    <pointer-type-def type-id='type-id-3506' size-in-bits='64' id='type-id-2154'/>
+    <qualified-type-def type-id='type-id-2143' const='yes' id='type-id-3501'/>
+    <pointer-type-def type-id='type-id-3501' size-in-bits='64' id='type-id-2154'/>
     <reference-type-def kind='lvalue' type-id='type-id-2148' size-in-bits='64' id='type-id-2156'/>
-    <qualified-type-def type-id='type-id-2148' const='yes' id='type-id-3507'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3507' size-in-bits='64' id='type-id-2157'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3506' size-in-bits='64' id='type-id-2158'/>
+    <qualified-type-def type-id='type-id-2148' const='yes' id='type-id-3502'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3502' size-in-bits='64' id='type-id-2157'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3501' size-in-bits='64' id='type-id-2158'/>
     <pointer-type-def type-id='type-id-2574' size-in-bits='64' id='type-id-2560'/>
     <pointer-type-def type-id='type-id-2562' size-in-bits='64' id='type-id-2575'/>
-    <qualified-type-def type-id='type-id-2562' const='yes' id='type-id-3508'/>
-    <pointer-type-def type-id='type-id-3508' size-in-bits='64' id='type-id-2576'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3508' size-in-bits='64' id='type-id-2561'/>
+    <qualified-type-def type-id='type-id-2562' const='yes' id='type-id-3503'/>
+    <pointer-type-def type-id='type-id-3503' size-in-bits='64' id='type-id-2576'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3503' size-in-bits='64' id='type-id-2561'/>
     <pointer-type-def type-id='type-id-2558' size-in-bits='64' id='type-id-2563'/>
     <reference-type-def kind='rvalue' type-id='type-id-2558' size-in-bits='64' id='type-id-2564'/>
     <reference-type-def kind='lvalue' type-id='type-id-2558' size-in-bits='64' id='type-id-2565'/>
     <reference-type-def kind='lvalue' type-id='type-id-2165' size-in-bits='64' id='type-id-2566'/>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-2569'/>
-    <pointer-type-def type-id='type-id-3509' size-in-bits='64' id='type-id-2572'/>
+    <pointer-type-def type-id='type-id-3504' size-in-bits='64' id='type-id-2572'/>
     <pointer-type-def type-id='type-id-2167' size-in-bits='64' id='type-id-2168'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2166' size-in-bits='64' id='type-id-3510'/>
-    <pointer-type-def type-id='type-id-3511' size-in-bits='64' id='type-id-2573'/>
-    <pointer-type-def type-id='type-id-3512' size-in-bits='64' id='type-id-2172'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2166' size-in-bits='64' id='type-id-3505'/>
+    <pointer-type-def type-id='type-id-3506' size-in-bits='64' id='type-id-2573'/>
+    <pointer-type-def type-id='type-id-3507' size-in-bits='64' id='type-id-2172'/>
     <pointer-type-def type-id='type-id-2169' size-in-bits='64' id='type-id-2173'/>
-    <qualified-type-def type-id='type-id-2169' const='yes' id='type-id-3513'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3513' size-in-bits='64' id='type-id-2174'/>
+    <qualified-type-def type-id='type-id-2169' const='yes' id='type-id-3508'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3508' size-in-bits='64' id='type-id-2174'/>
     <reference-type-def kind='rvalue' type-id='type-id-2169' size-in-bits='64' id='type-id-2175'/>
     <reference-type-def kind='lvalue' type-id='type-id-2169' size-in-bits='64' id='type-id-2176'/>
-    <pointer-type-def type-id='type-id-3513' size-in-bits='64' id='type-id-2177'/>
-    <pointer-type-def type-id='type-id-3514' size-in-bits='64' id='type-id-2182'/>
+    <pointer-type-def type-id='type-id-3508' size-in-bits='64' id='type-id-2177'/>
+    <pointer-type-def type-id='type-id-3509' size-in-bits='64' id='type-id-2182'/>
     <pointer-type-def type-id='type-id-2179' size-in-bits='64' id='type-id-2183'/>
-    <qualified-type-def type-id='type-id-2179' const='yes' id='type-id-3515'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3515' size-in-bits='64' id='type-id-2184'/>
+    <qualified-type-def type-id='type-id-2179' const='yes' id='type-id-3510'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3510' size-in-bits='64' id='type-id-2184'/>
     <reference-type-def kind='rvalue' type-id='type-id-2179' size-in-bits='64' id='type-id-2185'/>
     <reference-type-def kind='lvalue' type-id='type-id-2179' size-in-bits='64' id='type-id-2186'/>
-    <pointer-type-def type-id='type-id-3515' size-in-bits='64' id='type-id-2187'/>
+    <pointer-type-def type-id='type-id-3510' size-in-bits='64' id='type-id-2187'/>
     <pointer-type-def type-id='type-id-2192' size-in-bits='64' id='type-id-2198'/>
     <reference-type-def kind='rvalue' type-id='type-id-1757' size-in-bits='64' id='type-id-2200'/>
     <reference-type-def kind='rvalue' type-id='type-id-2192' size-in-bits='64' id='type-id-2201'/>
     <reference-type-def kind='lvalue' type-id='type-id-2192' size-in-bits='64' id='type-id-2202'/>
-    <qualified-type-def type-id='type-id-2192' const='yes' id='type-id-3516'/>
-    <pointer-type-def type-id='type-id-3516' size-in-bits='64' id='type-id-2203'/>
+    <qualified-type-def type-id='type-id-2192' const='yes' id='type-id-3511'/>
+    <pointer-type-def type-id='type-id-3511' size-in-bits='64' id='type-id-2203'/>
     <reference-type-def kind='lvalue' type-id='type-id-2197' size-in-bits='64' id='type-id-2205'/>
-    <qualified-type-def type-id='type-id-2197' const='yes' id='type-id-3517'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3517' size-in-bits='64' id='type-id-2206'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3516' size-in-bits='64' id='type-id-2207'/>
+    <qualified-type-def type-id='type-id-2197' const='yes' id='type-id-3512'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3512' size-in-bits='64' id='type-id-2206'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3511' size-in-bits='64' id='type-id-2207'/>
     <pointer-type-def type-id='type-id-2210' size-in-bits='64' id='type-id-2211'/>
-    <qualified-type-def type-id='type-id-2210' const='yes' id='type-id-3518'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3518' size-in-bits='64' id='type-id-2212'/>
+    <qualified-type-def type-id='type-id-2210' const='yes' id='type-id-3513'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3513' size-in-bits='64' id='type-id-2212'/>
     <reference-type-def kind='lvalue' type-id='type-id-2210' size-in-bits='64' id='type-id-2213'/>
-    <qualified-type-def type-id='type-id-2217' volatile='yes' id='type-id-3519'/>
-    <qualified-type-def type-id='type-id-3519' const='yes' id='type-id-3520'/>
-    <pointer-type-def type-id='type-id-3520' size-in-bits='64' id='type-id-2218'/>
-    <qualified-type-def type-id='type-id-2219' volatile='yes' id='type-id-3521'/>
-    <qualified-type-def type-id='type-id-3521' const='yes' id='type-id-3522'/>
-    <pointer-type-def type-id='type-id-3522' size-in-bits='64' id='type-id-2220'/>
-    <qualified-type-def type-id='type-id-2221' volatile='yes' id='type-id-3523'/>
-    <qualified-type-def type-id='type-id-3523' const='yes' id='type-id-3524'/>
-    <pointer-type-def type-id='type-id-3524' size-in-bits='64' id='type-id-2222'/>
-    <qualified-type-def type-id='type-id-2224' volatile='yes' id='type-id-3525'/>
-    <qualified-type-def type-id='type-id-3525' const='yes' id='type-id-3526'/>
-    <pointer-type-def type-id='type-id-3526' size-in-bits='64' id='type-id-2240'/>
-    <qualified-type-def type-id='type-id-1031' volatile='yes' id='type-id-3527'/>
-    <qualified-type-def type-id='type-id-3527' const='yes' id='type-id-3528'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3528' size-in-bits='64' id='type-id-2241'/>
-    <qualified-type-def type-id='type-id-2246' volatile='yes' id='type-id-3529'/>
-    <qualified-type-def type-id='type-id-3529' const='yes' id='type-id-3530'/>
-    <pointer-type-def type-id='type-id-3530' size-in-bits='64' id='type-id-2250'/>
-    <qualified-type-def type-id='type-id-1025' volatile='yes' id='type-id-3531'/>
-    <qualified-type-def type-id='type-id-3531' const='yes' id='type-id-3532'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3532' size-in-bits='64' id='type-id-2251'/>
-    <qualified-type-def type-id='type-id-2253' volatile='yes' id='type-id-3533'/>
-    <qualified-type-def type-id='type-id-3533' const='yes' id='type-id-3534'/>
-    <pointer-type-def type-id='type-id-3534' size-in-bits='64' id='type-id-2254'/>
-    <qualified-type-def type-id='type-id-2255' volatile='yes' id='type-id-3535'/>
-    <qualified-type-def type-id='type-id-3535' const='yes' id='type-id-3536'/>
-    <pointer-type-def type-id='type-id-3536' size-in-bits='64' id='type-id-2256'/>
-    <qualified-type-def type-id='type-id-2257' volatile='yes' id='type-id-3537'/>
-    <qualified-type-def type-id='type-id-3537' const='yes' id='type-id-3538'/>
-    <pointer-type-def type-id='type-id-3538' size-in-bits='64' id='type-id-2258'/>
-    <qualified-type-def type-id='type-id-2264' volatile='yes' id='type-id-3539'/>
-    <qualified-type-def type-id='type-id-3539' const='yes' id='type-id-3540'/>
-    <pointer-type-def type-id='type-id-3540' size-in-bits='64' id='type-id-2265'/>
-    <qualified-type-def type-id='type-id-2268' volatile='yes' id='type-id-3541'/>
-    <qualified-type-def type-id='type-id-3541' const='yes' id='type-id-3542'/>
-    <pointer-type-def type-id='type-id-3542' size-in-bits='64' id='type-id-2269'/>
-    <qualified-type-def type-id='type-id-2270' volatile='yes' id='type-id-3543'/>
+    <qualified-type-def type-id='type-id-2217' volatile='yes' id='type-id-3514'/>
+    <qualified-type-def type-id='type-id-3514' const='yes' id='type-id-3515'/>
+    <pointer-type-def type-id='type-id-3515' size-in-bits='64' id='type-id-2218'/>
+    <qualified-type-def type-id='type-id-2219' volatile='yes' id='type-id-3516'/>
+    <qualified-type-def type-id='type-id-3516' const='yes' id='type-id-3517'/>
+    <pointer-type-def type-id='type-id-3517' size-in-bits='64' id='type-id-2220'/>
+    <qualified-type-def type-id='type-id-2221' volatile='yes' id='type-id-3518'/>
+    <qualified-type-def type-id='type-id-3518' const='yes' id='type-id-3519'/>
+    <pointer-type-def type-id='type-id-3519' size-in-bits='64' id='type-id-2222'/>
+    <qualified-type-def type-id='type-id-2224' volatile='yes' id='type-id-3520'/>
+    <qualified-type-def type-id='type-id-3520' const='yes' id='type-id-3521'/>
+    <pointer-type-def type-id='type-id-3521' size-in-bits='64' id='type-id-2240'/>
+    <qualified-type-def type-id='type-id-1031' volatile='yes' id='type-id-3522'/>
+    <qualified-type-def type-id='type-id-3522' const='yes' id='type-id-3523'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3523' size-in-bits='64' id='type-id-2241'/>
+    <qualified-type-def type-id='type-id-2246' volatile='yes' id='type-id-3524'/>
+    <qualified-type-def type-id='type-id-3524' const='yes' id='type-id-3525'/>
+    <pointer-type-def type-id='type-id-3525' size-in-bits='64' id='type-id-2250'/>
+    <qualified-type-def type-id='type-id-1025' volatile='yes' id='type-id-3526'/>
+    <qualified-type-def type-id='type-id-3526' const='yes' id='type-id-3527'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3527' size-in-bits='64' id='type-id-2251'/>
+    <qualified-type-def type-id='type-id-2253' volatile='yes' id='type-id-3528'/>
+    <qualified-type-def type-id='type-id-3528' const='yes' id='type-id-3529'/>
+    <pointer-type-def type-id='type-id-3529' size-in-bits='64' id='type-id-2254'/>
+    <qualified-type-def type-id='type-id-2255' volatile='yes' id='type-id-3530'/>
+    <qualified-type-def type-id='type-id-3530' const='yes' id='type-id-3531'/>
+    <pointer-type-def type-id='type-id-3531' size-in-bits='64' id='type-id-2256'/>
+    <qualified-type-def type-id='type-id-2257' volatile='yes' id='type-id-3532'/>
+    <qualified-type-def type-id='type-id-3532' const='yes' id='type-id-3533'/>
+    <pointer-type-def type-id='type-id-3533' size-in-bits='64' id='type-id-2258'/>
+    <qualified-type-def type-id='type-id-2264' volatile='yes' id='type-id-3534'/>
+    <qualified-type-def type-id='type-id-3534' const='yes' id='type-id-3535'/>
+    <pointer-type-def type-id='type-id-3535' size-in-bits='64' id='type-id-2265'/>
+    <qualified-type-def type-id='type-id-2268' volatile='yes' id='type-id-3536'/>
+    <qualified-type-def type-id='type-id-3536' const='yes' id='type-id-3537'/>
+    <pointer-type-def type-id='type-id-3537' size-in-bits='64' id='type-id-2269'/>
+    <qualified-type-def type-id='type-id-2270' volatile='yes' id='type-id-3538'/>
+    <qualified-type-def type-id='type-id-3538' const='yes' id='type-id-3539'/>
+    <pointer-type-def type-id='type-id-3539' size-in-bits='64' id='type-id-2271'/>
+    <qualified-type-def type-id='type-id-2272' volatile='yes' id='type-id-3540'/>
+    <qualified-type-def type-id='type-id-3540' const='yes' id='type-id-3541'/>
+    <pointer-type-def type-id='type-id-3541' size-in-bits='64' id='type-id-2273'/>
+    <qualified-type-def type-id='type-id-1339' const='yes' id='type-id-3542'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3542' size-in-bits='64' id='type-id-2278'/>
+    <qualified-type-def type-id='type-id-2280' volatile='yes' id='type-id-3543'/>
     <qualified-type-def type-id='type-id-3543' const='yes' id='type-id-3544'/>
-    <pointer-type-def type-id='type-id-3544' size-in-bits='64' id='type-id-2271'/>
-    <qualified-type-def type-id='type-id-2272' volatile='yes' id='type-id-3545'/>
-    <qualified-type-def type-id='type-id-3545' const='yes' id='type-id-3546'/>
-    <pointer-type-def type-id='type-id-3546' size-in-bits='64' id='type-id-2273'/>
-    <qualified-type-def type-id='type-id-1339' const='yes' id='type-id-3547'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3547' size-in-bits='64' id='type-id-2278'/>
-    <qualified-type-def type-id='type-id-2280' volatile='yes' id='type-id-3548'/>
-    <qualified-type-def type-id='type-id-3548' const='yes' id='type-id-3549'/>
-    <pointer-type-def type-id='type-id-3549' size-in-bits='64' id='type-id-2281'/>
-    <qualified-type-def type-id='type-id-1411' const='yes' id='type-id-3550'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3550' size-in-bits='64' id='type-id-2283'/>
+    <pointer-type-def type-id='type-id-3544' size-in-bits='64' id='type-id-2281'/>
+    <qualified-type-def type-id='type-id-1411' const='yes' id='type-id-3545'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3545' size-in-bits='64' id='type-id-2283'/>
     <pointer-type-def type-id='type-id-2285' size-in-bits='64' id='type-id-2863'/>
-    <qualified-type-def type-id='type-id-2285' const='yes' id='type-id-3551'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3551' size-in-bits='64' id='type-id-2864'/>
+    <qualified-type-def type-id='type-id-2285' const='yes' id='type-id-3546'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3546' size-in-bits='64' id='type-id-2864'/>
     <pointer-type-def type-id='type-id-2294' size-in-bits='64' id='type-id-2298'/>
     <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-2297'/>
     <reference-type-def kind='lvalue' type-id='type-id-2294' size-in-bits='64' id='type-id-2299'/>
 
     <array-type-def dimensions='1' type-id='type-id-2693' size-in-bits='768' id='type-id-2303'>
-      <subrange length='96' type-id='type-id-2918' id='type-id-3552'/>
+      <subrange length='96' type-id='type-id-2918' id='type-id-3547'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-2295' size-in-bits='64' id='type-id-2866'/>
-    <qualified-type-def type-id='type-id-2295' const='yes' id='type-id-3553'/>
-    <pointer-type-def type-id='type-id-3553' size-in-bits='64' id='type-id-2867'/>
+    <qualified-type-def type-id='type-id-2295' const='yes' id='type-id-3548'/>
+    <pointer-type-def type-id='type-id-3548' size-in-bits='64' id='type-id-2867'/>
     <pointer-type-def type-id='type-id-2293' size-in-bits='64' id='type-id-2296'/>
     <pointer-type-def type-id='type-id-2287' size-in-bits='64' id='type-id-2289'/>
-    <pointer-type-def type-id='type-id-3551' size-in-bits='64' id='type-id-2865'/>
+    <pointer-type-def type-id='type-id-3546' size-in-bits='64' id='type-id-2865'/>
     <reference-type-def kind='lvalue' type-id='type-id-2287' size-in-bits='64' id='type-id-2859'/>
-    <qualified-type-def type-id='type-id-2287' const='yes' id='type-id-3554'/>
-    <pointer-type-def type-id='type-id-3554' size-in-bits='64' id='type-id-2324'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3554' size-in-bits='64' id='type-id-2862'/>
+    <qualified-type-def type-id='type-id-2287' const='yes' id='type-id-3549'/>
+    <pointer-type-def type-id='type-id-3549' size-in-bits='64' id='type-id-2324'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3549' size-in-bits='64' id='type-id-2862'/>
     <pointer-type-def type-id='type-id-2284' size-in-bits='64' id='type-id-2291'/>
-    <qualified-type-def type-id='type-id-2284' const='yes' id='type-id-3555'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3555' size-in-bits='64' id='type-id-2292'/>
+    <qualified-type-def type-id='type-id-2284' const='yes' id='type-id-3550'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3550' size-in-bits='64' id='type-id-2292'/>
     <pointer-type-def type-id='type-id-2306' size-in-bits='64' id='type-id-2315'/>
     <reference-type-def kind='lvalue' type-id='type-id-2327' size-in-bits='64' id='type-id-2325'/>
     <reference-type-def kind='lvalue' type-id='type-id-2284' size-in-bits='64' id='type-id-2319'/>
     <pointer-type-def type-id='type-id-2331' size-in-bits='64' id='type-id-2339'/>
     <reference-type-def kind='lvalue' type-id='type-id-2350' size-in-bits='64' id='type-id-2348'/>
     <pointer-type-def type-id='type-id-2353' size-in-bits='64' id='type-id-2874'/>
-    <qualified-type-def type-id='type-id-2353' const='yes' id='type-id-3556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3556' size-in-bits='64' id='type-id-2875'/>
+    <qualified-type-def type-id='type-id-2353' const='yes' id='type-id-3551'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3551' size-in-bits='64' id='type-id-2875'/>
     <pointer-type-def type-id='type-id-2362' size-in-bits='64' id='type-id-2366'/>
     <reference-type-def kind='lvalue' type-id='type-id-577' size-in-bits='64' id='type-id-2365'/>
     <reference-type-def kind='lvalue' type-id='type-id-2362' size-in-bits='64' id='type-id-2367'/>
 
     <array-type-def dimensions='1' type-id='type-id-2693' size-in-bits='256' id='type-id-2371'>
-      <subrange length='32' type-id='type-id-2918' id='type-id-3557'/>
+      <subrange length='32' type-id='type-id-2918' id='type-id-3552'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-2363' size-in-bits='64' id='type-id-2877'/>
-    <qualified-type-def type-id='type-id-2363' const='yes' id='type-id-3558'/>
-    <pointer-type-def type-id='type-id-3558' size-in-bits='64' id='type-id-2878'/>
+    <qualified-type-def type-id='type-id-2363' const='yes' id='type-id-3553'/>
+    <pointer-type-def type-id='type-id-3553' size-in-bits='64' id='type-id-2878'/>
     <pointer-type-def type-id='type-id-2361' size-in-bits='64' id='type-id-2364'/>
     <pointer-type-def type-id='type-id-2355' size-in-bits='64' id='type-id-2357'/>
-    <pointer-type-def type-id='type-id-3556' size-in-bits='64' id='type-id-2876'/>
+    <pointer-type-def type-id='type-id-3551' size-in-bits='64' id='type-id-2876'/>
     <reference-type-def kind='lvalue' type-id='type-id-2355' size-in-bits='64' id='type-id-2870'/>
-    <qualified-type-def type-id='type-id-2355' const='yes' id='type-id-3559'/>
-    <pointer-type-def type-id='type-id-3559' size-in-bits='64' id='type-id-2393'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3559' size-in-bits='64' id='type-id-2873'/>
+    <qualified-type-def type-id='type-id-2355' const='yes' id='type-id-3554'/>
+    <pointer-type-def type-id='type-id-3554' size-in-bits='64' id='type-id-2393'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3554' size-in-bits='64' id='type-id-2873'/>
     <reference-type-def kind='rvalue' type-id='type-id-3119' size-in-bits='64' id='type-id-2388'/>
     <pointer-type-def type-id='type-id-2352' size-in-bits='64' id='type-id-2359'/>
-    <qualified-type-def type-id='type-id-2352' const='yes' id='type-id-3560'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3560' size-in-bits='64' id='type-id-2360'/>
+    <qualified-type-def type-id='type-id-2352' const='yes' id='type-id-3555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3555' size-in-bits='64' id='type-id-2360'/>
     <pointer-type-def type-id='type-id-2374' size-in-bits='64' id='type-id-2383'/>
     <reference-type-def kind='lvalue' type-id='type-id-2396' size-in-bits='64' id='type-id-2394'/>
     <reference-type-def kind='lvalue' type-id='type-id-2352' size-in-bits='64' id='type-id-2387'/>
     <pointer-type-def type-id='type-id-2398' size-in-bits='64' id='type-id-2406'/>
     <reference-type-def kind='lvalue' type-id='type-id-2417' size-in-bits='64' id='type-id-2415'/>
-    <qualified-type-def type-id='type-id-2419' volatile='yes' id='type-id-3561'/>
-    <qualified-type-def type-id='type-id-3561' const='yes' id='type-id-3562'/>
-    <pointer-type-def type-id='type-id-3562' size-in-bits='64' id='type-id-2420'/>
-    <qualified-type-def type-id='type-id-2423' volatile='yes' id='type-id-3563'/>
-    <qualified-type-def type-id='type-id-3563' const='yes' id='type-id-3564'/>
-    <pointer-type-def type-id='type-id-3564' size-in-bits='64' id='type-id-2424'/>
-    <qualified-type-def type-id='type-id-2428' volatile='yes' id='type-id-3565'/>
-    <qualified-type-def type-id='type-id-3565' const='yes' id='type-id-3566'/>
-    <pointer-type-def type-id='type-id-3566' size-in-bits='64' id='type-id-2429'/>
-    <qualified-type-def type-id='type-id-1502' const='yes' id='type-id-3567'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3567' size-in-bits='64' id='type-id-2431'/>
+    <qualified-type-def type-id='type-id-2419' volatile='yes' id='type-id-3556'/>
+    <qualified-type-def type-id='type-id-3556' const='yes' id='type-id-3557'/>
+    <pointer-type-def type-id='type-id-3557' size-in-bits='64' id='type-id-2420'/>
+    <qualified-type-def type-id='type-id-2423' volatile='yes' id='type-id-3558'/>
+    <qualified-type-def type-id='type-id-3558' const='yes' id='type-id-3559'/>
+    <pointer-type-def type-id='type-id-3559' size-in-bits='64' id='type-id-2424'/>
+    <qualified-type-def type-id='type-id-2428' volatile='yes' id='type-id-3560'/>
+    <qualified-type-def type-id='type-id-3560' const='yes' id='type-id-3561'/>
+    <pointer-type-def type-id='type-id-3561' size-in-bits='64' id='type-id-2429'/>
+    <qualified-type-def type-id='type-id-1502' const='yes' id='type-id-3562'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3562' size-in-bits='64' id='type-id-2431'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-98'/>
-    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-3568'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3568' size-in-bits='64' id='type-id-72'/>
-    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-3569'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3569' size-in-bits='64' id='type-id-99'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-3563'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3563' size-in-bits='64' id='type-id-72'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-3564'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3564' size-in-bits='64' id='type-id-99'/>
     <reference-type-def kind='lvalue' type-id='type-id-97' size-in-bits='64' id='type-id-94'/>
     <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-100'/>
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-3570'/>
-    <pointer-type-def type-id='type-id-3570' size-in-bits='64' id='type-id-2493'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-3565'/>
+    <pointer-type-def type-id='type-id-3565' size-in-bits='64' id='type-id-2493'/>
     <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-101'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3570' size-in-bits='64' id='type-id-73'/>
-    <qualified-type-def type-id='type-id-83' const='yes' id='type-id-3571'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3571' size-in-bits='64' id='type-id-102'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3565' size-in-bits='64' id='type-id-73'/>
+    <qualified-type-def type-id='type-id-83' const='yes' id='type-id-3566'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3566' size-in-bits='64' id='type-id-102'/>
     <reference-type-def kind='lvalue' type-id='type-id-86' size-in-bits='64' id='type-id-95'/>
     <reference-type-def kind='lvalue' type-id='type-id-83' size-in-bits='64' id='type-id-103'/>
-    <qualified-type-def type-id='type-id-104' const='yes' id='type-id-3572'/>
-    <pointer-type-def type-id='type-id-3572' size-in-bits='64' id='type-id-111'/>
+    <qualified-type-def type-id='type-id-104' const='yes' id='type-id-3567'/>
+    <pointer-type-def type-id='type-id-3567' size-in-bits='64' id='type-id-111'/>
     <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-105'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3572' size-in-bits='64' id='type-id-74'/>
-    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-3573'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3573' size-in-bits='64' id='type-id-106'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3567' size-in-bits='64' id='type-id-74'/>
+    <qualified-type-def type-id='type-id-84' const='yes' id='type-id-3568'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3568' size-in-bits='64' id='type-id-106'/>
     <reference-type-def kind='lvalue' type-id='type-id-104' size-in-bits='64' id='type-id-96'/>
     <reference-type-def kind='lvalue' type-id='type-id-84' size-in-bits='64' id='type-id-107'/>
-    <qualified-type-def type-id='type-id-49' const='yes' id='type-id-3574'/>
-    <pointer-type-def type-id='type-id-3574' size-in-bits='64' id='type-id-88'/>
+    <qualified-type-def type-id='type-id-49' const='yes' id='type-id-3569'/>
+    <pointer-type-def type-id='type-id-3569' size-in-bits='64' id='type-id-88'/>
     <pointer-type-def type-id='type-id-49' size-in-bits='64' id='type-id-89'/>
-    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-3575'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3575' size-in-bits='64' id='type-id-75'/>
+    <qualified-type-def type-id='type-id-112' const='yes' id='type-id-3570'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3570' size-in-bits='64' id='type-id-75'/>
     <typedef-decl name='__hash_code' type-id='type-id-66' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1251' column='1' id='type-id-90'/>
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-124'/>
 
@@ -35456,152 +35451,152 @@
 
     </array-type-def>
     <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-2879'/>
-    <qualified-type-def type-id='type-id-117' const='yes' id='type-id-3576'/>
-    <pointer-type-def type-id='type-id-3576' size-in-bits='64' id='type-id-2880'/>
+    <qualified-type-def type-id='type-id-117' const='yes' id='type-id-3571'/>
+    <pointer-type-def type-id='type-id-3571' size-in-bits='64' id='type-id-2880'/>
     <pointer-type-def type-id='type-id-60' size-in-bits='64' id='type-id-119'/>
-    <qualified-type-def type-id='type-id-2500' const='yes' id='type-id-3577'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3577' size-in-bits='64' id='type-id-2501'/>
-    <qualified-type-def type-id='type-id-60' const='yes' id='type-id-3578'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3578' size-in-bits='64' id='type-id-123'/>
+    <qualified-type-def type-id='type-id-2500' const='yes' id='type-id-3572'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3572' size-in-bits='64' id='type-id-2501'/>
+    <qualified-type-def type-id='type-id-60' const='yes' id='type-id-3573'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3573' size-in-bits='64' id='type-id-123'/>
     <reference-type-def kind='rvalue' type-id='type-id-60' size-in-bits='64' id='type-id-2502'/>
     <reference-type-def kind='lvalue' type-id='type-id-60' size-in-bits='64' id='type-id-122'/>
-    <pointer-type-def type-id='type-id-3578' size-in-bits='64' id='type-id-121'/>
+    <pointer-type-def type-id='type-id-3573' size-in-bits='64' id='type-id-121'/>
     <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-118'/>
-    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-3579'/>
-    <pointer-type-def type-id='type-id-3579' size-in-bits='64' id='type-id-120'/>
+    <qualified-type-def type-id='type-id-113' const='yes' id='type-id-3574'/>
+    <pointer-type-def type-id='type-id-3574' size-in-bits='64' id='type-id-120'/>
     <pointer-type-def type-id='type-id-87' size-in-bits='64' id='type-id-115'/>
-    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-3580'/>
-    <pointer-type-def type-id='type-id-3580' size-in-bits='64' id='type-id-114'/>
-    <qualified-type-def type-id='type-id-54' const='yes' id='type-id-3581'/>
-    <pointer-type-def type-id='type-id-3581' size-in-bits='64' id='type-id-91'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-3575'/>
+    <pointer-type-def type-id='type-id-3575' size-in-bits='64' id='type-id-114'/>
+    <qualified-type-def type-id='type-id-54' const='yes' id='type-id-3576'/>
+    <pointer-type-def type-id='type-id-3576' size-in-bits='64' id='type-id-91'/>
     <pointer-type-def type-id='type-id-54' size-in-bits='64' id='type-id-92'/>
     <reference-type-def kind='lvalue' type-id='type-id-49' size-in-bits='64' id='type-id-93'/>
-    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-3582'/>
-    <pointer-type-def type-id='type-id-3582' size-in-bits='64' id='type-id-2504'/>
+    <qualified-type-def type-id='type-id-125' const='yes' id='type-id-3577'/>
+    <pointer-type-def type-id='type-id-3577' size-in-bits='64' id='type-id-2504'/>
     <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-126'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3582' size-in-bits='64' id='type-id-76'/>
-    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-3583'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3583' size-in-bits='64' id='type-id-127'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3577' size-in-bits='64' id='type-id-76'/>
+    <qualified-type-def type-id='type-id-50' const='yes' id='type-id-3578'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3578' size-in-bits='64' id='type-id-127'/>
     <reference-type-def kind='lvalue' type-id='type-id-125' size-in-bits='64' id='type-id-81'/>
     <reference-type-def kind='lvalue' type-id='type-id-50' size-in-bits='64' id='type-id-128'/>
     <pointer-type-def type-id='type-id-48' size-in-bits='64' id='type-id-71'/>
-    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-3584'/>
-    <pointer-type-def type-id='type-id-3584' size-in-bits='64' id='type-id-77'/>
+    <qualified-type-def type-id='type-id-48' const='yes' id='type-id-3579'/>
+    <pointer-type-def type-id='type-id-3579' size-in-bits='64' id='type-id-77'/>
     <pointer-type-def type-id='type-id-53' size-in-bits='64' id='type-id-79'/>
     <reference-type-def kind='lvalue' type-id='type-id-48' size-in-bits='64' id='type-id-80'/>
     <reference-type-def kind='lvalue' type-id='type-id-130' size-in-bits='64' id='type-id-135'/>
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-133'/>
-    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-3585'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3585' size-in-bits='64' id='type-id-134'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-3580'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3580' size-in-bits='64' id='type-id-134'/>
     <reference-type-def kind='rvalue' type-id='type-id-132' size-in-bits='64' id='type-id-136'/>
-    <qualified-type-def type-id='type-id-130' const='yes' id='type-id-3586'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3586' size-in-bits='64' id='type-id-138'/>
-    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-3587'/>
-    <pointer-type-def type-id='type-id-3587' size-in-bits='64' id='type-id-137'/>
+    <qualified-type-def type-id='type-id-130' const='yes' id='type-id-3581'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3581' size-in-bits='64' id='type-id-138'/>
+    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-3582'/>
+    <pointer-type-def type-id='type-id-3582' size-in-bits='64' id='type-id-137'/>
     <reference-type-def kind='lvalue' type-id='type-id-141' size-in-bits='64' id='type-id-148'/>
     <pointer-type-def type-id='type-id-140' size-in-bits='64' id='type-id-147'/>
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-3588'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3588' size-in-bits='64' id='type-id-149'/>
-    <qualified-type-def type-id='type-id-151' const='yes' id='type-id-3589'/>
-    <pointer-type-def type-id='type-id-3589' size-in-bits='64' id='type-id-152'/>
+    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-3583'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3583' size-in-bits='64' id='type-id-149'/>
+    <qualified-type-def type-id='type-id-151' const='yes' id='type-id-3584'/>
+    <pointer-type-def type-id='type-id-3584' size-in-bits='64' id='type-id-152'/>
     <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-154'/>
-    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-3590'/>
-    <pointer-type-def type-id='type-id-3590' size-in-bits='64' id='type-id-157'/>
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-3591'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3591' size-in-bits='64' id='type-id-158'/>
+    <qualified-type-def type-id='type-id-155' const='yes' id='type-id-3585'/>
+    <pointer-type-def type-id='type-id-3585' size-in-bits='64' id='type-id-157'/>
+    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-3586'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3586' size-in-bits='64' id='type-id-158'/>
     <pointer-type-def type-id='type-id-2507' size-in-bits='64' id='type-id-2887'/>
-    <qualified-type-def type-id='type-id-2507' const='yes' id='type-id-3592'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3592' size-in-bits='64' id='type-id-2888'/>
-    <pointer-type-def type-id='type-id-3592' size-in-bits='64' id='type-id-2889'/>
+    <qualified-type-def type-id='type-id-2507' const='yes' id='type-id-3587'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3587' size-in-bits='64' id='type-id-2888'/>
+    <pointer-type-def type-id='type-id-3587' size-in-bits='64' id='type-id-2889'/>
     <reference-type-def kind='lvalue' type-id='type-id-87' size-in-bits='64' id='type-id-2883'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3580' size-in-bits='64' id='type-id-2886'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3575' size-in-bits='64' id='type-id-2886'/>
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-2508'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-3593'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3593' size-in-bits='64' id='type-id-178'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-3588'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3588' size-in-bits='64' id='type-id-178'/>
     <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-176'/>
-    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-3594'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3594' size-in-bits='64' id='type-id-177'/>
+    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-3589'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3589' size-in-bits='64' id='type-id-177'/>
     <reference-type-def kind='lvalue' type-id='type-id-162' size-in-bits='64' id='type-id-180'/>
     <reference-type-def kind='lvalue' type-id='type-id-160' size-in-bits='64' id='type-id-179'/>
     <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-168'/>
-    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-3595'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3595' size-in-bits='64' id='type-id-169'/>
+    <qualified-type-def type-id='type-id-159' const='yes' id='type-id-3590'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3590' size-in-bits='64' id='type-id-169'/>
     <reference-type-def kind='rvalue' type-id='type-id-159' size-in-bits='64' id='type-id-170'/>
     <reference-type-def kind='lvalue' type-id='type-id-161' size-in-bits='64' id='type-id-171'/>
-    <qualified-type-def type-id='type-id-161' const='yes' id='type-id-3596'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3596' size-in-bits='64' id='type-id-173'/>
-    <pointer-type-def type-id='type-id-3595' size-in-bits='64' id='type-id-172'/>
+    <qualified-type-def type-id='type-id-161' const='yes' id='type-id-3591'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3591' size-in-bits='64' id='type-id-173'/>
+    <pointer-type-def type-id='type-id-3590' size-in-bits='64' id='type-id-172'/>
     <pointer-type-def type-id='type-id-163' size-in-bits='64' id='type-id-174'/>
-    <typedef-decl name='__node_base' type-id='type-id-116' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-3597'/>
-    <pointer-type-def type-id='type-id-3597' size-in-bits='64' id='type-id-166'/>
-    <typedef-decl name='__bucket_type' type-id='type-id-166' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-3598'/>
-    <pointer-type-def type-id='type-id-3598' size-in-bits='64' id='type-id-175'/>
+    <typedef-decl name='__node_base' type-id='type-id-116' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1904' column='1' id='type-id-3592'/>
+    <pointer-type-def type-id='type-id-3592' size-in-bits='64' id='type-id-166'/>
+    <typedef-decl name='__bucket_type' type-id='type-id-166' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/hashtable_policy.h' line='1905' column='1' id='type-id-3593'/>
+    <pointer-type-def type-id='type-id-3593' size-in-bits='64' id='type-id-175'/>
     <pointer-type-def type-id='type-id-2471' size-in-bits='64' id='type-id-2478'/>
     <pointer-type-def type-id='type-id-181' size-in-bits='64' id='type-id-184'/>
-    <qualified-type-def type-id='type-id-181' const='yes' id='type-id-3599'/>
-    <pointer-type-def type-id='type-id-3599' size-in-bits='64' id='type-id-185'/>
+    <qualified-type-def type-id='type-id-181' const='yes' id='type-id-3594'/>
+    <pointer-type-def type-id='type-id-3594' size-in-bits='64' id='type-id-185'/>
     <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-2510'/>
-    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-3600'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3600' size-in-bits='64' id='type-id-2512'/>
+    <qualified-type-def type-id='type-id-186' const='yes' id='type-id-3595'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3595' size-in-bits='64' id='type-id-2512'/>
     <reference-type-def kind='rvalue' type-id='type-id-186' size-in-bits='64' id='type-id-2513'/>
     <reference-type-def kind='lvalue' type-id='type-id-186' size-in-bits='64' id='type-id-2514'/>
-    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-3601'/>
-    <pointer-type-def type-id='type-id-3601' size-in-bits='64' id='type-id-2479'/>
+    <qualified-type-def type-id='type-id-142' const='yes' id='type-id-3596'/>
+    <pointer-type-def type-id='type-id-3596' size-in-bits='64' id='type-id-2479'/>
     <reference-type-def kind='lvalue' type-id='type-id-2473' size-in-bits='64' id='type-id-2481'/>
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-2480'/>
     <pointer-type-def type-id='type-id-2474' size-in-bits='64' id='type-id-2482'/>
     <reference-type-def kind='rvalue' type-id='type-id-142' size-in-bits='64' id='type-id-2483'/>
     <pointer-type-def type-id='type-id-2515' size-in-bits='64' id='type-id-2894'/>
-    <qualified-type-def type-id='type-id-2515' const='yes' id='type-id-3602'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3602' size-in-bits='64' id='type-id-2895'/>
-    <pointer-type-def type-id='type-id-3602' size-in-bits='64' id='type-id-2896'/>
+    <qualified-type-def type-id='type-id-2515' const='yes' id='type-id-3597'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3597' size-in-bits='64' id='type-id-2895'/>
+    <pointer-type-def type-id='type-id-3597' size-in-bits='64' id='type-id-2896'/>
     <pointer-type-def type-id='type-id-2475' size-in-bits='64' id='type-id-2516'/>
-    <qualified-type-def type-id='type-id-2475' const='yes' id='type-id-3603'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3603' size-in-bits='64' id='type-id-2517'/>
-    <qualified-type-def type-id='type-id-2441' const='yes' id='type-id-3604'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3604' size-in-bits='64' id='type-id-2484'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3601' size-in-bits='64' id='type-id-2485'/>
-    <qualified-type-def type-id='type-id-2439' const='yes' id='type-id-3605'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3605' size-in-bits='64' id='type-id-2486'/>
+    <qualified-type-def type-id='type-id-2475' const='yes' id='type-id-3598'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3598' size-in-bits='64' id='type-id-2517'/>
+    <qualified-type-def type-id='type-id-2441' const='yes' id='type-id-3599'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3599' size-in-bits='64' id='type-id-2484'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3596' size-in-bits='64' id='type-id-2485'/>
+    <qualified-type-def type-id='type-id-2439' const='yes' id='type-id-3600'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3600' size-in-bits='64' id='type-id-2486'/>
     <reference-type-def kind='lvalue' type-id='type-id-142' size-in-bits='64' id='type-id-2487'/>
-    <qualified-type-def type-id='type-id-2449' const='yes' id='type-id-3606'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3606' size-in-bits='64' id='type-id-2488'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3599' size-in-bits='64' id='type-id-2489'/>
+    <qualified-type-def type-id='type-id-2449' const='yes' id='type-id-3601'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3601' size-in-bits='64' id='type-id-2488'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3594' size-in-bits='64' id='type-id-2489'/>
     <pointer-type-def type-id='type-id-2472' size-in-bits='64' id='type-id-2490'/>
-    <qualified-type-def type-id='type-id-2477' const='yes' id='type-id-3607'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3607' size-in-bits='64' id='type-id-2491'/>
+    <qualified-type-def type-id='type-id-2477' const='yes' id='type-id-3602'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3602' size-in-bits='64' id='type-id-2491'/>
     <pointer-type-def type-id='type-id-2432' size-in-bits='64' id='type-id-2455'/>
-    <qualified-type-def type-id='type-id-2437' const='yes' id='type-id-3608'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3608' size-in-bits='64' id='type-id-2456'/>
-    <qualified-type-def type-id='type-id-2438' const='yes' id='type-id-3609'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3609' size-in-bits='64' id='type-id-2457'/>
-    <qualified-type-def type-id='type-id-2440' const='yes' id='type-id-3610'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-2458'/>
-    <qualified-type-def type-id='type-id-2432' const='yes' id='type-id-3611'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3611' size-in-bits='64' id='type-id-2459'/>
+    <qualified-type-def type-id='type-id-2437' const='yes' id='type-id-3603'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3603' size-in-bits='64' id='type-id-2456'/>
+    <qualified-type-def type-id='type-id-2438' const='yes' id='type-id-3604'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3604' size-in-bits='64' id='type-id-2457'/>
+    <qualified-type-def type-id='type-id-2440' const='yes' id='type-id-3605'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3605' size-in-bits='64' id='type-id-2458'/>
+    <qualified-type-def type-id='type-id-2432' const='yes' id='type-id-3606'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3606' size-in-bits='64' id='type-id-2459'/>
     <reference-type-def kind='rvalue' type-id='type-id-2432' size-in-bits='64' id='type-id-2460'/>
     <reference-type-def kind='lvalue' type-id='type-id-2432' size-in-bits='64' id='type-id-2461'/>
-    <pointer-type-def type-id='type-id-3611' size-in-bits='64' id='type-id-2462'/>
-    <qualified-type-def type-id='type-id-2446' const='yes' id='type-id-3612'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3612' size-in-bits='64' id='type-id-2463'/>
-    <qualified-type-def type-id='type-id-2448' const='yes' id='type-id-3613'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3613' size-in-bits='64' id='type-id-2465'/>
+    <pointer-type-def type-id='type-id-3606' size-in-bits='64' id='type-id-2462'/>
+    <qualified-type-def type-id='type-id-2446' const='yes' id='type-id-3607'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3607' size-in-bits='64' id='type-id-2463'/>
+    <qualified-type-def type-id='type-id-2448' const='yes' id='type-id-3608'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3608' size-in-bits='64' id='type-id-2465'/>
     <reference-type-def kind='lvalue' type-id='type-id-2450' size-in-bits='64' id='type-id-2468'/>
     <reference-type-def kind='rvalue' type-id='type-id-2448' size-in-bits='64' id='type-id-2469'/>
-    <qualified-type-def type-id='type-id-2450' const='yes' id='type-id-3614'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3614' size-in-bits='64' id='type-id-2470'/>
+    <qualified-type-def type-id='type-id-2450' const='yes' id='type-id-3609'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3609' size-in-bits='64' id='type-id-2470'/>
     <pointer-type-def type-id='type-id-2577' size-in-bits='64' id='type-id-2579'/>
-    <qualified-type-def type-id='type-id-2577' const='yes' id='type-id-3615'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3615' size-in-bits='64' id='type-id-2580'/>
+    <qualified-type-def type-id='type-id-2577' const='yes' id='type-id-3610'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3610' size-in-bits='64' id='type-id-2580'/>
     <reference-type-def kind='lvalue' type-id='type-id-2577' size-in-bits='64' id='type-id-2581'/>
     <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-1241'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3616'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3611'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3617' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3612' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-3618' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-3613' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35627,7 +35622,7 @@
         <member-function access='private'>
           <function-decl name='__call&lt;void, const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, 0, 1&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EE6__callIvJS5_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_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EE6__callIvJS5_EJLm0ELm1EEEET_OSt5tupleIJDpT0_EESt12_Index_tupleIJXspT1_EEE'>
             <parameter type-id='type-id-880' is-artificial='yes'/>
-            <parameter type-id='type-id-3619'/>
+            <parameter type-id='type-id-3614'/>
             <parameter type-id='type-id-1073'/>
             <return type-id='type-id-11'/>
           </function-decl>
@@ -35635,9 +35630,9 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2IJRKSC_S8_EEEOSA_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES8_EEC2IJRKSC_S8_EEEOSA_DpOT_'>
             <parameter type-id='type-id-880' is-artificial='yes'/>
-            <parameter type-id='type-id-3620'/>
+            <parameter type-id='type-id-3615'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3621'/>
+            <parameter type-id='type-id-3616'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -35645,12 +35640,12 @@
     </namespace-decl>
     <namespace-decl name='std'>
       <class-decl name='_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' size-in-bits='192' 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-1479'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3622'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3617'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3623' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3618' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_bound_args' type-id='type-id-3624' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-3619' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -35684,24 +35679,24 @@
         <member-function access='public'>
           <function-decl name='_Bind&lt;const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2IJRKSG_S8_SC_EEEOSE_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EES8_SC_EEC2IJRKSG_S8_SC_EEEOSE_DpOT_'>
             <parameter type-id='type-id-884' is-artificial='yes'/>
-            <parameter type-id='type-id-3625'/>
+            <parameter type-id='type-id-3620'/>
             <parameter type-id='type-id-930'/>
+            <parameter type-id='type-id-3616'/>
             <parameter type-id='type-id-3621'/>
-            <parameter type-id='type-id-3626'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-882'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3628' size-in-bits='64' id='type-id-886'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3622' size-in-bits='64' id='type-id-882'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-886'/>
     <function-type size-in-bits='64' id='type-id-3357'>
       <parameter type-id='type-id-847'/>
       <parameter type-id='type-id-845'/>
       <parameter type-id='type-id-848'/>
       <return type-id='type-id-19'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3514'>
+    <function-type size-in-bits='64' id='type-id-3509'>
       <parameter type-id='type-id-845'/>
       <parameter type-id='type-id-196'/>
       <parameter type-id='type-id-1074'/>
@@ -35716,11 +35711,11 @@
       <parameter type-id='type-id-845'/>
       <return type-id='type-id-196'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3511'>
-      <parameter type-id='type-id-3510'/>
-      <return type-id='type-id-3510'/>
+    <function-type size-in-bits='64' id='type-id-3506'>
+      <parameter type-id='type-id-3505'/>
+      <return type-id='type-id-3505'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3509'>
+    <function-type size-in-bits='64' id='type-id-3504'>
       <parameter type-id='type-id-2566'/>
       <return type-id='type-id-2566'/>
     </function-type>
@@ -35744,7 +35739,7 @@
       <parameter type-id='type-id-845'/>
       <return type-id='type-id-11'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3512'>
+    <function-type size-in-bits='64' id='type-id-3507'>
       <parameter type-id='type-id-845'/>
       <parameter type-id='type-id-1183'/>
       <return type-id='type-id-11'/>
@@ -35765,75 +35760,75 @@
     </function-type>
     <reference-type-def kind='rvalue' type-id='type-id-1241' size-in-bits='64' id='type-id-881'/>
     <pointer-type-def type-id='type-id-1241' size-in-bits='64' id='type-id-880'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3629' size-in-bits='64' id='type-id-914'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-914'/>
     <reference-type-def kind='lvalue' type-id='type-id-880' size-in-bits='64' id='type-id-913'/>
     <reference-type-def kind='rvalue' type-id='type-id-1479' size-in-bits='64' id='type-id-885'/>
     <pointer-type-def type-id='type-id-1479' size-in-bits='64' id='type-id-884'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-916'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3625' size-in-bits='64' id='type-id-916'/>
     <reference-type-def kind='lvalue' type-id='type-id-884' size-in-bits='64' id='type-id-915'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3631' size-in-bits='64' id='type-id-2242'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-2223'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3626' size-in-bits='64' id='type-id-2242'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-2223'/>
     <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-3633'>
+      <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-3628'>
         <member-type access='public'>
           <typedef-decl name='type' type-id='type-id-1240' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-2239'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='__add_rvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackHandle &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-3634'>
+      <class-decl name='__add_rvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackHandle &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-3629'>
         <member-type access='public'>
           <typedef-decl name='type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-2236'/>
         </member-type>
       </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-3631'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3635'/>
+      <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-3626'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3630'/>
         <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-3636' is-artificial='yes'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3636' is-artificial='yes'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
             <parameter type-id='type-id-1240'/>
             <return type-id='type-id-11'/>
           </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-3636' is-artificial='yes'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3632'/>
             <return type-id='type-id-11'/>
           </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-3636' is-artificial='yes'/>
-            <parameter type-id='type-id-3619'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3614'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3636' is-artificial='yes'/>
-            <parameter type-id='type-id-3637'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3632'/>
             <return type-id='type-id-2242'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3636' is-artificial='yes'/>
-            <parameter type-id='type-id-3619'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
+            <parameter type-id='type-id-3614'/>
             <return type-id='type-id-2242'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt5tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE4swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3636' is-artificial='yes'/>
+            <parameter type-id='type-id-3631' is-artificial='yes'/>
             <parameter type-id='type-id-2242'/>
             <return type-id='type-id-11'/>
           </function-decl>
@@ -35841,52 +35836,52 @@
       </class-decl>
     </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-3632'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3638'/>
+      <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-3627'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3633'/>
         <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-3639' is-artificial='yes'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3639' is-artificial='yes'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
             <parameter type-id='type-id-932'/>
             <return type-id='type-id-11'/>
           </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-3639' is-artificial='yes'/>
-            <parameter type-id='type-id-3640'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
+            <parameter type-id='type-id-3635'/>
             <return type-id='type-id-11'/>
           </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-3639' is-artificial='yes'/>
-            <parameter type-id='type-id-3641'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
+            <parameter type-id='type-id-3636'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEaSERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3639' is-artificial='yes'/>
-            <parameter type-id='type-id-3640'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
+            <parameter type-id='type-id-3635'/>
             <return type-id='type-id-2223'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEEaSEOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3639' is-artificial='yes'/>
-            <parameter type-id='type-id-3641'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
+            <parameter type-id='type-id-3636'/>
             <return type-id='type-id-2223'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt5tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEE4swapERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3639' is-artificial='yes'/>
+            <parameter type-id='type-id-3634' is-artificial='yes'/>
             <parameter type-id='type-id-2223'/>
             <return type-id='type-id-11'/>
           </function-decl>
@@ -35894,534 +35889,534 @@
       </class-decl>
     </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-3624'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3642'/>
+      <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-3619'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3637'/>
         <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-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3644'/>
-            <parameter type-id='type-id-3645'/>
+            <parameter type-id='type-id-3639'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-11'/>
           </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-3643' is-artificial='yes'/>
-            <parameter type-id='type-id-3646'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
+            <parameter type-id='type-id-3641'/>
             <return type-id='type-id-11'/>
           </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-3643' is-artificial='yes'/>
-            <parameter type-id='type-id-3647'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
+            <parameter type-id='type-id-3642'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEaSERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='472' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3643' is-artificial='yes'/>
-            <parameter type-id='type-id-3646'/>
-            <return type-id='type-id-3648'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
+            <parameter type-id='type-id-3641'/>
+            <return type-id='type-id-3643'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEaSEOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3643' is-artificial='yes'/>
-            <parameter type-id='type-id-3647'/>
-            <return type-id='type-id-3648'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
+            <parameter type-id='type-id-3642'/>
+            <return type-id='type-id-3643'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE4swapERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='507' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3643' is-artificial='yes'/>
-            <parameter type-id='type-id-3648'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
+            <parameter type-id='type-id-3643'/>
             <return type-id='type-id-11'/>
           </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-3643' is-artificial='yes'/>
+            <parameter type-id='type-id-3638' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
+            <parameter type-id='type-id-3616'/>
             <parameter type-id='type-id-3621'/>
-            <parameter type-id='type-id-3626'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </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-3618'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3649'/>
+      <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-3613'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3644'/>
         <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-3650' is-artificial='yes'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3650' is-artificial='yes'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3644'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-11'/>
           </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-3650' is-artificial='yes'/>
-            <parameter type-id='type-id-3651'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
+            <parameter type-id='type-id-3646'/>
             <return type-id='type-id-11'/>
           </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-3650' is-artificial='yes'/>
-            <parameter type-id='type-id-3652'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
+            <parameter type-id='type-id-3647'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3650' is-artificial='yes'/>
-            <parameter type-id='type-id-3651'/>
-            <return type-id='type-id-3653'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
+            <parameter type-id='type-id-3646'/>
+            <return type-id='type-id-3648'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3650' is-artificial='yes'/>
-            <parameter type-id='type-id-3652'/>
-            <return type-id='type-id-3653'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
+            <parameter type-id='type-id-3647'/>
+            <return type-id='type-id-3648'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE4swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='667' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3650' is-artificial='yes'/>
-            <parameter type-id='type-id-3653'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
+            <parameter type-id='type-id-3648'/>
             <return type-id='type-id-11'/>
           </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-3650' is-artificial='yes'/>
+            <parameter type-id='type-id-3645' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3621'/>
+            <parameter type-id='type-id-3616'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1241' const='yes' id='type-id-3627'/>
-    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-3628'/>
-    <reference-type-def kind='rvalue' type-id='type-id-2784' size-in-bits='64' id='type-id-3626'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3654' size-in-bits='64' id='type-id-3621'/>
-    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-3629'/>
-    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-3630'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3631' size-in-bits='64' id='type-id-3619'/>
+    <qualified-type-def type-id='type-id-1241' const='yes' id='type-id-3622'/>
+    <qualified-type-def type-id='type-id-1479' const='yes' id='type-id-3623'/>
+    <reference-type-def kind='rvalue' type-id='type-id-2784' size-in-bits='64' id='type-id-3621'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3616'/>
+    <qualified-type-def type-id='type-id-880' const='yes' id='type-id-3624'/>
+    <qualified-type-def type-id='type-id-884' const='yes' id='type-id-3625'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3626' size-in-bits='64' id='type-id-3614'/>
     <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-3622'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3655'/>
+      <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-3617'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3650'/>
       </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-3616'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3656'/>
+      <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-3611'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3651'/>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-3657' size-in-bits='64' id='type-id-3623'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-3625'/>
-    <pointer-type-def type-id='type-id-3658' size-in-bits='64' id='type-id-3617'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3617' size-in-bits='64' id='type-id-3620'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3659' size-in-bits='64' id='type-id-3637'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3660' size-in-bits='64' id='type-id-3640'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3646'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3651'/>
-    <function-type size-in-bits='64' id='type-id-3657'>
+    <pointer-type-def type-id='type-id-3652' size-in-bits='64' id='type-id-3618'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3618' size-in-bits='64' id='type-id-3620'/>
+    <pointer-type-def type-id='type-id-3653' size-in-bits='64' id='type-id-3612'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3612' size-in-bits='64' id='type-id-3615'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3654' size-in-bits='64' id='type-id-3632'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3655' size-in-bits='64' id='type-id-3635'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3656' size-in-bits='64' id='type-id-3641'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3657' size-in-bits='64' id='type-id-3646'/>
+    <function-type size-in-bits='64' id='type-id-3652'>
       <parameter type-id='type-id-1341'/>
-      <parameter type-id='type-id-3654'/>
+      <parameter type-id='type-id-3649'/>
       <parameter type-id='type-id-2784'/>
       <return type-id='type-id-11'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3658'>
+    <function-type size-in-bits='64' id='type-id-3653'>
       <parameter type-id='type-id-1240'/>
-      <parameter type-id='type-id-3654'/>
+      <parameter type-id='type-id-3649'/>
       <return type-id='type-id-11'/>
     </function-type>
-    <reference-type-def kind='lvalue' type-id='type-id-3663' size-in-bits='64' id='type-id-3645'/>
-    <pointer-type-def type-id='type-id-3664' size-in-bits='64' id='type-id-3654'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3665' size-in-bits='64' id='type-id-3644'/>
-    <pointer-type-def type-id='type-id-3631' size-in-bits='64' id='type-id-3636'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3632' size-in-bits='64' id='type-id-3641'/>
-    <pointer-type-def type-id='type-id-3632' size-in-bits='64' id='type-id-3639'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3648'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3624' size-in-bits='64' id='type-id-3647'/>
-    <pointer-type-def type-id='type-id-3624' size-in-bits='64' id='type-id-3643'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3618' size-in-bits='64' id='type-id-3653'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3618' size-in-bits='64' id='type-id-3652'/>
-    <pointer-type-def type-id='type-id-3618' size-in-bits='64' id='type-id-3650'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3658' size-in-bits='64' id='type-id-3640'/>
+    <pointer-type-def type-id='type-id-3659' size-in-bits='64' id='type-id-3649'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3660' size-in-bits='64' id='type-id-3639'/>
+    <pointer-type-def type-id='type-id-3626' size-in-bits='64' id='type-id-3631'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3627' size-in-bits='64' id='type-id-3636'/>
+    <pointer-type-def type-id='type-id-3627' size-in-bits='64' id='type-id-3634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3619' size-in-bits='64' id='type-id-3643'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3619' size-in-bits='64' id='type-id-3642'/>
+    <pointer-type-def type-id='type-id-3619' size-in-bits='64' id='type-id-3638'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3613' size-in-bits='64' id='type-id-3648'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3613' size-in-bits='64' id='type-id-3647'/>
+    <pointer-type-def type-id='type-id-3613' size-in-bits='64' id='type-id-3645'/>
     <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-3635'>
+      <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-3630'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-556'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3666'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3661'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-556' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3667'/>
+          <typedef-decl name='_Inherited' type-id='type-id-556' 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' 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-3668'/>
+            <parameter type-id='type-id-3663'/>
             <return type-id='type-id-1240'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_headERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3669'/>
+            <parameter type-id='type-id-3664'/>
             <return type-id='type-id-1240'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_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'>
-            <parameter type-id='type-id-3668'/>
-            <return type-id='type-id-3670'/>
+            <parameter type-id='type-id-3663'/>
+            <return type-id='type-id-3665'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_tailERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3669'/>
-            <return type-id='type-id-3671'/>
+            <parameter type-id='type-id-3664'/>
+            <return type-id='type-id-3666'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3672' is-artificial='yes'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3672' is-artificial='yes'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
             <parameter type-id='type-id-1240'/>
             <return type-id='type-id-11'/>
           </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-3672' is-artificial='yes'/>
-            <parameter type-id='type-id-3669'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
+            <parameter type-id='type-id-3664'/>
             <return type-id='type-id-11'/>
           </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-3672' is-artificial='yes'/>
-            <parameter type-id='type-id-3673'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
+            <parameter type-id='type-id-3668'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3672' is-artificial='yes'/>
-            <parameter type-id='type-id-3669'/>
-            <return type-id='type-id-3668'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
+            <parameter type-id='type-id-3664'/>
+            <return type-id='type-id-3663'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3672' is-artificial='yes'/>
-            <parameter type-id='type-id-3673'/>
-            <return type-id='type-id-3668'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
+            <parameter type-id='type-id-3668'/>
+            <return type-id='type-id-3663'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm0EJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEE7_M_swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3672' is-artificial='yes'/>
-            <parameter type-id='type-id-3668'/>
+            <parameter type-id='type-id-3667' is-artificial='yes'/>
+            <parameter type-id='type-id-3663'/>
             <return type-id='type-id-11'/>
           </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-3638'>
+      <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-3633'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-556'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3674'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3669'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-556' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3675'/>
+          <typedef-decl name='_Inherited' type-id='type-id-556' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3670'/>
         </member-type>
         <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-3676'/>
+            <parameter type-id='type-id-3671'/>
             <return type-id='type-id-932'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_headERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677'/>
+            <parameter type-id='type-id-3672'/>
             <return type-id='type-id-932'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_tailERS5_' 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'>
-            <parameter type-id='type-id-3676'/>
-            <return type-id='type-id-3678'/>
+            <parameter type-id='type-id-3671'/>
+            <return type-id='type-id-3673'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_tailERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3677'/>
-            <return type-id='type-id-3679'/>
+            <parameter type-id='type-id-3672'/>
+            <return type-id='type-id-3674'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3680' is-artificial='yes'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3680' is-artificial='yes'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
             <parameter type-id='type-id-932'/>
             <return type-id='type-id-11'/>
           </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-3680' is-artificial='yes'/>
-            <parameter type-id='type-id-3677'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
+            <parameter type-id='type-id-3672'/>
             <return type-id='type-id-11'/>
           </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-3680' is-artificial='yes'/>
-            <parameter type-id='type-id-3681'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
+            <parameter type-id='type-id-3676'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEaSERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3680' is-artificial='yes'/>
-            <parameter type-id='type-id-3677'/>
-            <return type-id='type-id-3676'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
+            <parameter type-id='type-id-3672'/>
+            <return type-id='type-id-3671'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEEaSEOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3680' is-artificial='yes'/>
-            <parameter type-id='type-id-3681'/>
-            <return type-id='type-id-3676'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
+            <parameter type-id='type-id-3676'/>
+            <return type-id='type-id-3671'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEE7_M_swapERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3680' is-artificial='yes'/>
-            <parameter type-id='type-id-3676'/>
+            <parameter type-id='type-id-3675' is-artificial='yes'/>
+            <parameter type-id='type-id-3671'/>
             <return type-id='type-id-11'/>
           </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-3642'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3682'/>
+      <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-3637'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3677'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1352'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3682' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3683'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3677' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3678'/>
         </member-type>
         <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-3684'/>
+            <parameter type-id='type-id-3679'/>
             <return type-id='type-id-966'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_headERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3685'/>
+            <parameter type-id='type-id-3680'/>
             <return type-id='type-id-930'/>
           </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-3684'/>
-            <return type-id='type-id-3686'/>
+            <parameter type-id='type-id-3679'/>
+            <return type-id='type-id-3681'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3685'/>
-            <return type-id='type-id-3687'/>
+            <parameter type-id='type-id-3680'/>
+            <return type-id='type-id-3682'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3688' is-artificial='yes'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3644'/>
-            <parameter type-id='type-id-3645'/>
+            <parameter type-id='type-id-3639'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-11'/>
           </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-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3685'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
+            <parameter type-id='type-id-3680'/>
             <return type-id='type-id-11'/>
           </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-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3689'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
+            <parameter type-id='type-id-3684'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEaSERKSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3685'/>
-            <return type-id='type-id-3684'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
+            <parameter type-id='type-id-3680'/>
+            <return type-id='type-id-3679'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEEaSEOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3689'/>
-            <return type-id='type-id-3684'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
+            <parameter type-id='type-id-3684'/>
+            <return type-id='type-id-3679'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEE7_M_swapERSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3688' is-artificial='yes'/>
-            <parameter type-id='type-id-3684'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
+            <parameter type-id='type-id-3679'/>
             <return type-id='type-id-11'/>
           </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-3688' is-artificial='yes'/>
+            <parameter type-id='type-id-3683' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
+            <parameter type-id='type-id-3616'/>
             <parameter type-id='type-id-3621'/>
-            <parameter type-id='type-id-3626'/>
             <return type-id='type-id-11'/>
           </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-3649'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3690'/>
+      <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-3644'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3685'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1352'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3691'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3685' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3686'/>
         </member-type>
         <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-3692'/>
+            <parameter type-id='type-id-3687'/>
             <return type-id='type-id-966'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693'/>
+            <parameter type-id='type-id-3688'/>
             <return type-id='type-id-930'/>
           </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-3692'/>
-            <return type-id='type-id-3694'/>
+            <parameter type-id='type-id-3687'/>
+            <return type-id='type-id-3689'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3693'/>
-            <return type-id='type-id-3695'/>
+            <parameter type-id='type-id-3688'/>
+            <return type-id='type-id-3690'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3644'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-11'/>
           </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-3696' is-artificial='yes'/>
-            <parameter type-id='type-id-3693'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <parameter type-id='type-id-3688'/>
             <return type-id='type-id-11'/>
           </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-3696' is-artificial='yes'/>
-            <parameter type-id='type-id-3697'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <parameter type-id='type-id-3692'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3696' is-artificial='yes'/>
-            <parameter type-id='type-id-3693'/>
-            <return type-id='type-id-3692'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <parameter type-id='type-id-3688'/>
+            <return type-id='type-id-3687'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3696' is-artificial='yes'/>
-            <parameter type-id='type-id-3697'/>
-            <return type-id='type-id-3692'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <parameter type-id='type-id-3692'/>
+            <return type-id='type-id-3687'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEE7_M_swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3696' is-artificial='yes'/>
-            <parameter type-id='type-id-3692'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
+            <parameter type-id='type-id-3687'/>
             <return type-id='type-id-11'/>
           </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-3696' is-artificial='yes'/>
+            <parameter type-id='type-id-3691' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
-            <parameter type-id='type-id-3621'/>
+            <parameter type-id='type-id-3616'/>
             <return type-id='type-id-11'/>
           </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-3655'/>
+      <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-3650'/>
     </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-3656'/>
+      <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-3651'/>
     </namespace-decl>
     <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-3664'>
+        <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-3659'>
           <data-member access='private' layout-offset-in-bits='0'>
-            <var-decl name='_algorithm' type-id='type-id-3698' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='116' column='1'/>
+            <var-decl name='_algorithm' type-id='type-id-3693' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='116' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='64'>
             <var-decl name='_onCompletion' type-id='type-id-828' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='117' column='1'/>
@@ -36430,7 +36425,7 @@
             <var-decl name='_sufficientResponsesReceived' type-id='type-id-707' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='118' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='448'>
-            <var-decl name='_callbacks' type-id='type-id-3699' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='119' column='1'/>
+            <var-decl name='_callbacks' type-id='type-id-3694' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='119' column='1'/>
           </data-member>
           <data-member access='private' layout-offset-in-bits='640'>
             <var-decl name='_actualResponses' type-id='type-id-2597' visibility='default' filepath='src/mongo/db/repl/scatter_gather_runner.h' line='120' column='1'/>
@@ -36440,41 +36435,41 @@
           </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-3654' is-artificial='yes'/>
-              <parameter type-id='type-id-3700'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
+              <parameter type-id='type-id-3695'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='private'>
             <function-decl name='operator=' mangled-name='_ZN5mongo4repl19ScatterGatherRunneraSERKS1_' 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-3654' is-artificial='yes'/>
-              <parameter type-id='type-id-3700'/>
-              <return type-id='type-id-3701'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
+              <parameter type-id='type-id-3695'/>
+              <return type-id='type-id-3696'/>
             </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-3654' is-artificial='yes'/>
-              <parameter type-id='type-id-3698'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
+              <parameter type-id='type-id-3693'/>
               <return type-id='type-id-11'/>
             </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-3654' is-artificial='yes'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
               <return type-id='type-id-11'/>
             </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-3654' is-artificial='yes'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
               <parameter type-id='type-id-940'/>
               <return type-id='type-id-1100'/>
             </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-3654' is-artificial='yes'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
               <parameter type-id='type-id-940'/>
               <parameter type-id='type-id-834'/>
               <return type-id='type-id-2627'/>
@@ -36482,7 +36477,7 @@
           </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-3654' is-artificial='yes'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
               <parameter type-id='type-id-940'/>
               <return type-id='type-id-11'/>
             </function-decl>
@@ -36490,13 +36485,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-1240'/>
-              <parameter type-id='type-id-3654'/>
+              <parameter type-id='type-id-3649'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </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-3654' is-artificial='yes'/>
+              <parameter type-id='type-id-3649' is-artificial='yes'/>
               <parameter type-id='type-id-940'/>
               <return type-id='type-id-11'/>
             </function-decl>
@@ -36504,71 +36499,71 @@
         </class-decl>
       </namespace-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3702' size-in-bits='64' id='type-id-3669'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3703' size-in-bits='64' id='type-id-3671'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3704' size-in-bits='64' id='type-id-3677'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3705' size-in-bits='64' id='type-id-3679'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3706' size-in-bits='64' id='type-id-3685'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3707' size-in-bits='64' id='type-id-3687'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3708' size-in-bits='64' id='type-id-3693'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3709' size-in-bits='64' id='type-id-3695'/>
-    <qualified-type-def type-id='type-id-3631' const='yes' id='type-id-3659'/>
-    <qualified-type-def type-id='type-id-3632' const='yes' id='type-id-3660'/>
-    <qualified-type-def type-id='type-id-3624' const='yes' id='type-id-3661'/>
-    <qualified-type-def type-id='type-id-3618' const='yes' id='type-id-3662'/>
-    <qualified-type-def type-id='type-id-2784' const='yes' id='type-id-3663'/>
-    <qualified-type-def type-id='type-id-3654' const='yes' id='type-id-3665'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3635' size-in-bits='64' id='type-id-3668'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3635' size-in-bits='64' id='type-id-3673'/>
-    <pointer-type-def type-id='type-id-3635' size-in-bits='64' id='type-id-3672'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3667' size-in-bits='64' id='type-id-3670'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3638' size-in-bits='64' id='type-id-3676'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3638' size-in-bits='64' id='type-id-3681'/>
-    <pointer-type-def type-id='type-id-3638' size-in-bits='64' id='type-id-3680'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3675' size-in-bits='64' id='type-id-3678'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3642' size-in-bits='64' id='type-id-3684'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3642' size-in-bits='64' id='type-id-3689'/>
-    <pointer-type-def type-id='type-id-3642' size-in-bits='64' id='type-id-3688'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3683' size-in-bits='64' id='type-id-3686'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3692'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3697'/>
-    <pointer-type-def type-id='type-id-3649' size-in-bits='64' id='type-id-3696'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3691' size-in-bits='64' id='type-id-3694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3697' size-in-bits='64' id='type-id-3664'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3698' size-in-bits='64' id='type-id-3666'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3699' size-in-bits='64' id='type-id-3672'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3700' size-in-bits='64' id='type-id-3674'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3701' size-in-bits='64' id='type-id-3680'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3702' size-in-bits='64' id='type-id-3682'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3703' size-in-bits='64' id='type-id-3688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3704' size-in-bits='64' id='type-id-3690'/>
+    <qualified-type-def type-id='type-id-3626' const='yes' id='type-id-3654'/>
+    <qualified-type-def type-id='type-id-3627' const='yes' id='type-id-3655'/>
+    <qualified-type-def type-id='type-id-3619' const='yes' id='type-id-3656'/>
+    <qualified-type-def type-id='type-id-3613' const='yes' id='type-id-3657'/>
+    <qualified-type-def type-id='type-id-2784' const='yes' id='type-id-3658'/>
+    <qualified-type-def type-id='type-id-3649' const='yes' id='type-id-3660'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-3663'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3630' size-in-bits='64' id='type-id-3668'/>
+    <pointer-type-def type-id='type-id-3630' size-in-bits='64' id='type-id-3667'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3662' size-in-bits='64' id='type-id-3665'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3633' size-in-bits='64' id='type-id-3671'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3633' size-in-bits='64' id='type-id-3676'/>
+    <pointer-type-def type-id='type-id-3633' size-in-bits='64' id='type-id-3675'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3670' size-in-bits='64' id='type-id-3673'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3637' size-in-bits='64' id='type-id-3679'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3637' size-in-bits='64' id='type-id-3684'/>
+    <pointer-type-def type-id='type-id-3637' size-in-bits='64' id='type-id-3683'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3678' size-in-bits='64' id='type-id-3681'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3687'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3644' size-in-bits='64' id='type-id-3692'/>
+    <pointer-type-def type-id='type-id-3644' size-in-bits='64' id='type-id-3691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3686' size-in-bits='64' id='type-id-3689'/>
     <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-3666'>
+      <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-3661'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-1240' 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-3710' is-artificial='yes'/>
+            <parameter type-id='type-id-3705' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3710' is-artificial='yes'/>
+            <parameter type-id='type-id-3705' is-artificial='yes'/>
             <parameter type-id='type-id-1240'/>
             <return type-id='type-id-11'/>
           </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-3710' is-artificial='yes'/>
-            <parameter type-id='type-id-3711'/>
+            <parameter type-id='type-id-3705' is-artificial='yes'/>
+            <parameter type-id='type-id-3706'/>
             <return type-id='type-id-11'/>
           </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-3710' is-artificial='yes'/>
-            <parameter type-id='type-id-3712'/>
+            <parameter type-id='type-id-3705' is-artificial='yes'/>
+            <parameter type-id='type-id-3707'/>
             <return type-id='type-id-11'/>
           </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-3710' is-artificial='yes'/>
+            <parameter type-id='type-id-3705' is-artificial='yes'/>
             <parameter type-id='type-id-424'/>
             <parameter type-id='type-id-425'/>
             <return type-id='type-id-11'/>
@@ -36576,53 +36571,53 @@
         </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-3713'/>
+            <parameter type-id='type-id-3708'/>
             <return type-id='type-id-1240'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsELb0EE7_M_headERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3711'/>
+            <parameter type-id='type-id-3706'/>
             <return type-id='type-id-1240'/>
           </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-3674'>
+      <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-3669'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-932' 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-3714' is-artificial='yes'/>
+            <parameter type-id='type-id-3709' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3714' is-artificial='yes'/>
+            <parameter type-id='type-id-3709' is-artificial='yes'/>
             <parameter type-id='type-id-932'/>
             <return type-id='type-id-11'/>
           </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-3714' is-artificial='yes'/>
-            <parameter type-id='type-id-3715'/>
+            <parameter type-id='type-id-3709' is-artificial='yes'/>
+            <parameter type-id='type-id-3710'/>
             <return type-id='type-id-11'/>
           </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-3714' is-artificial='yes'/>
-            <parameter type-id='type-id-3716'/>
+            <parameter type-id='type-id-3709' is-artificial='yes'/>
+            <parameter type-id='type-id-3711'/>
             <return type-id='type-id-11'/>
           </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-3714' is-artificial='yes'/>
+            <parameter type-id='type-id-3709' is-artificial='yes'/>
             <parameter type-id='type-id-424'/>
             <parameter type-id='type-id-425'/>
             <return type-id='type-id-11'/>
@@ -36630,660 +36625,660 @@
         </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-3717'/>
+            <parameter type-id='type-id-3712'/>
             <return type-id='type-id-932'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm0ERN5mongo8executor12TaskExecutor14CallbackHandleELb0EE7_M_headERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3715'/>
+            <parameter type-id='type-id-3710'/>
             <return type-id='type-id-932'/>
           </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-3682'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3718'/>
-        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3719'/>
+      <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-3677'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3713'/>
+        <base-class access='private' layout-offset-in-bits='64' type-id='type-id-3714'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3718' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3720'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3713' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3715'/>
         </member-type>
         <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-3721'/>
-            <return type-id='type-id-3722'/>
+            <parameter type-id='type-id-3716'/>
+            <return type-id='type-id-3717'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3723'/>
-            <return type-id='type-id-3644'/>
+            <parameter type-id='type-id-3718'/>
+            <return type-id='type-id-3639'/>
           </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-3721'/>
-            <return type-id='type-id-3724'/>
+            <parameter type-id='type-id-3716'/>
+            <return type-id='type-id-3719'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3723'/>
-            <return type-id='type-id-3725'/>
+            <parameter type-id='type-id-3718'/>
+            <return type-id='type-id-3720'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3726' is-artificial='yes'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3726' is-artificial='yes'/>
-            <parameter type-id='type-id-3644'/>
-            <parameter type-id='type-id-3645'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-11'/>
           </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-3726' is-artificial='yes'/>
-            <parameter type-id='type-id-3723'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3718'/>
             <return type-id='type-id-11'/>
           </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-3726' is-artificial='yes'/>
-            <parameter type-id='type-id-3727'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3722'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEaSERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3726' is-artificial='yes'/>
-            <parameter type-id='type-id-3723'/>
-            <return type-id='type-id-3721'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3718'/>
+            <return type-id='type-id-3716'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEaSEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3726' is-artificial='yes'/>
-            <parameter type-id='type-id-3727'/>
-            <return type-id='type-id-3721'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3722'/>
+            <return type-id='type-id-3716'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEPNS0_10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_swapERSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3726' is-artificial='yes'/>
-            <parameter type-id='type-id-3721'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3716'/>
             <return type-id='type-id-11'/>
           </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-3726' is-artificial='yes'/>
+            <parameter type-id='type-id-3721' is-artificial='yes'/>
+            <parameter type-id='type-id-3616'/>
             <parameter type-id='type-id-3621'/>
-            <parameter type-id='type-id-3626'/>
             <return type-id='type-id-11'/>
           </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-3690'>
+      <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-3685'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-409'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3719'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3714'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3728'/>
+          <typedef-decl name='_Inherited' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3723'/>
         </member-type>
         <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-3729'/>
-            <return type-id='type-id-3722'/>
+            <parameter type-id='type-id-3724'/>
+            <return type-id='type-id-3717'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_headERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730'/>
-            <return type-id='type-id-3644'/>
+            <parameter type-id='type-id-3725'/>
+            <return type-id='type-id-3639'/>
           </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-3729'/>
-            <return type-id='type-id-3731'/>
+            <parameter type-id='type-id-3724'/>
+            <return type-id='type-id-3726'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_tailERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3730'/>
-            <return type-id='type-id-3732'/>
+            <parameter type-id='type-id-3725'/>
+            <return type-id='type-id-3727'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3733' is-artificial='yes'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3644'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-11'/>
           </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-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3730'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3725'/>
             <return type-id='type-id-11'/>
           </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-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3734'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3729'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEaSERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3730'/>
-            <return type-id='type-id-3729'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3725'/>
+            <return type-id='type-id-3724'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3734'/>
-            <return type-id='type-id-3729'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3729'/>
+            <return type-id='type-id-3724'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm1EJPN5mongo4repl19ScatterGatherRunnerEEE7_M_swapERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3729'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3724'/>
             <return type-id='type-id-11'/>
           </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-3733' is-artificial='yes'/>
-            <parameter type-id='type-id-3621'/>
+            <parameter type-id='type-id-3728' is-artificial='yes'/>
+            <parameter type-id='type-id-3616'/>
             <return type-id='type-id-11'/>
           </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-3699'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3735'/>
+      <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-3694'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3730'/>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' 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='238' column='1' id='type-id-3736'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3732' 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-3731'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-1019' 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-3738'/>
+          <typedef-decl name='value_type' type-id='type-id-1019' 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-3733'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3740' 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-3739'/>
+          <typedef-decl name='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='231' column='1' id='type-id-3734'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3742' 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-3741'/>
+          <typedef-decl name='const_iterator' 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='233' column='1' id='type-id-3736'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3744' 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-3743'/>
+          <typedef-decl name='reverse_iterator' 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='235' column='1' id='type-id-3738'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3746' 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-3745'/>
+          <typedef-decl name='const_reverse_iterator' 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='234' column='1' id='type-id-3740'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3748' 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-3747'/>
+          <typedef-decl name='reference' type-id='type-id-3743' 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-3742'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3750' 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-3749'/>
+          <typedef-decl name='const_reference' type-id='type-id-3745' 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-3744'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3752' 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-3751'/>
+          <typedef-decl name='pointer' type-id='type-id-3747' 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-3746'/>
         </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-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3754'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3749'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3754'/>
+            <parameter type-id='type-id-3749'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
-            <parameter type-id='type-id-3754'/>
+            <parameter type-id='type-id-3750'/>
+            <parameter type-id='type-id-3749'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3756'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3751'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3757'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3752'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3756'/>
-            <parameter type-id='type-id-3754'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3751'/>
+            <parameter type-id='type-id-3749'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3757'/>
-            <parameter type-id='type-id-3754'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3752'/>
+            <parameter type-id='type-id-3749'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3758'/>
-            <parameter type-id='type-id-3754'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3753'/>
+            <parameter type-id='type-id-3749'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEaSERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3756'/>
-            <return type-id='type-id-3759'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3751'/>
+            <return type-id='type-id-3754'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEaSEOS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3757'/>
-            <return type-id='type-id-3759'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3752'/>
+            <return type-id='type-id-3754'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEaSESt16initializer_listIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='470' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3758'/>
-            <return type-id='type-id-3759'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3753'/>
+            <return type-id='type-id-3754'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='assign' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6assignEmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
+            <parameter type-id='type-id-3750'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='assign' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6assignESt16initializer_listIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3758'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3753'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3734'/>
           </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-3760' is-artificial='yes'/>
-            <return type-id='type-id-3741'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3736'/>
           </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-3753' is-artificial='yes'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3734'/>
           </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-3760' is-artificial='yes'/>
-            <return type-id='type-id-3741'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3736'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rbegin' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6rbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='583' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <return type-id='type-id-3743'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3738'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rbegin' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6rbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3745'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3740'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rend' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4rendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <return type-id='type-id-3743'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3738'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rend' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4rendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3745'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3740'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cbegin' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6cbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3741'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3736'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cend' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4cendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3741'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3736'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='crbegin' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE7crbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3745'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3740'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='crend' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5crendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3745'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3740'/>
           </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-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </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-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6resizeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6resizeEmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
+            <parameter type-id='type-id-3750'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shrink_to_fit' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13shrink_to_fitEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='capacity' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8capacityEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </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-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <return type-id='type-id-19'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE7reserveEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3747'/>
+            <return type-id='type-id-3742'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3749'/>
+            <return type-id='type-id-3744'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_range_check' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE14_M_range_checkEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='800' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='at' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE2atEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3747'/>
+            <return type-id='type-id-3742'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='at' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE2atEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3749'/>
+            <return type-id='type-id-3744'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='front' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5frontEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='851' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <return type-id='type-id-3747'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3742'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='front' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5frontEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='859' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3749'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3744'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='back' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='867' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <return type-id='type-id-3747'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <return type-id='type-id-3742'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='back' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='875' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
-            <return type-id='type-id-3749'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
+            <return type-id='type-id-3744'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-2632'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNKSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='898' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <return type-id='type-id-2633'/>
           </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-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3755'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3750'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE9push_backEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='931' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3761'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3756'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8pop_backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='949' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS3_S5_EERS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3741'/>
-            <parameter type-id='type-id-3755'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3736'/>
+            <parameter type-id='type-id-3750'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS3_S5_EEOS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1014' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3741'/>
-            <parameter type-id='type-id-3761'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3736'/>
+            <parameter type-id='type-id-3756'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS3_S5_EESt16initializer_listIS3_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1031' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3741'/>
-            <parameter type-id='type-id-3758'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3736'/>
+            <parameter type-id='type-id-3753'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS3_S5_EEmRS8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1051' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3741'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3736'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3750'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5eraseEN9__gnu_cxx17__normal_iteratorIPKS3_S5_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3741'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3736'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5eraseEN9__gnu_cxx17__normal_iteratorIPKS3_S5_EESA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1173' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3741'/>
-            <parameter type-id='type-id-3741'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3736'/>
+            <parameter type-id='type-id-3736'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE4swapERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1194' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3759'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3754'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='clear' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE5clearEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_initialize' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE18_M_fill_initializeEmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1298' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
+            <parameter type-id='type-id-3750'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_initialize' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE21_M_default_initializeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_assign' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE14_M_fill_assignEmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
+            <parameter type-id='type-id-3750'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS3_S5_EEmRKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3734'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3755'/>
+            <parameter type-id='type-id-3750'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_append' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE17_M_default_appendEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1400' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_shrink_to_fit' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE16_M_shrink_to_fitEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1403' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <return type-id='type-id-19'/>
           </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-3760' is-artificial='yes'/>
+            <parameter type-id='type-id-3755' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <parameter type-id='type-id-240'/>
             <return type-id='type-id-230'/>
@@ -37291,118 +37286,118 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE15_M_erase_at_endEPS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3751'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3746'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS3_S5_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3739'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3734'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS3_S5_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1446' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3739'/>
-            <parameter type-id='type-id-3739'/>
-            <return type-id='type-id-3739'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3734'/>
+            <parameter type-id='type-id-3734'/>
+            <return type-id='type-id-3734'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_move_assign' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE14_M_move_assignEOS5_St17integral_constantIbLb1EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1454' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3757'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3752'/>
             <parameter type-id='type-id-241'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_move_assign' mangled-name='_ZNSt6vectorIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE14_M_move_assignEOS5_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1465' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3753' is-artificial='yes'/>
-            <parameter type-id='type-id-3757'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
+            <parameter type-id='type-id-3752'/>
             <parameter type-id='type-id-242'/>
             <return type-id='type-id-11'/>
           </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-3753' is-artificial='yes'/>
+            <parameter type-id='type-id-3748' is-artificial='yes'/>
             <parameter type-id='type-id-946'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3762' size-in-bits='64' id='type-id-3700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3763' size-in-bits='64' id='type-id-3711'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3764' size-in-bits='64' id='type-id-3715'/>
-    <qualified-type-def type-id='type-id-3635' const='yes' id='type-id-3702'/>
-    <qualified-type-def type-id='type-id-3667' const='yes' id='type-id-3703'/>
-    <qualified-type-def type-id='type-id-3638' const='yes' id='type-id-3704'/>
-    <qualified-type-def type-id='type-id-3675' const='yes' id='type-id-3705'/>
-    <qualified-type-def type-id='type-id-3642' const='yes' id='type-id-3706'/>
-    <qualified-type-def type-id='type-id-3683' const='yes' id='type-id-3707'/>
-    <qualified-type-def type-id='type-id-3649' const='yes' id='type-id-3708'/>
-    <qualified-type-def type-id='type-id-3691' const='yes' id='type-id-3709'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3765' size-in-bits='64' id='type-id-3723'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3766' size-in-bits='64' id='type-id-3725'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3767' size-in-bits='64' id='type-id-3730'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3768' size-in-bits='64' id='type-id-3732'/>
-    <pointer-type-def type-id='type-id-3769' size-in-bits='64' id='type-id-3698'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3664' size-in-bits='64' id='type-id-3701'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3654' size-in-bits='64' id='type-id-3722'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3666' size-in-bits='64' id='type-id-3713'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3666' size-in-bits='64' id='type-id-3712'/>
-    <pointer-type-def type-id='type-id-3666' size-in-bits='64' id='type-id-3710'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3674' size-in-bits='64' id='type-id-3717'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3674' size-in-bits='64' id='type-id-3716'/>
-    <pointer-type-def type-id='type-id-3674' size-in-bits='64' id='type-id-3714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3682' size-in-bits='64' id='type-id-3721'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3682' size-in-bits='64' id='type-id-3727'/>
-    <pointer-type-def type-id='type-id-3682' size-in-bits='64' id='type-id-3726'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3720' size-in-bits='64' id='type-id-3724'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3690' size-in-bits='64' id='type-id-3729'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3690' size-in-bits='64' id='type-id-3734'/>
-    <pointer-type-def type-id='type-id-3690' size-in-bits='64' id='type-id-3733'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3728' size-in-bits='64' id='type-id-3731'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3757' size-in-bits='64' id='type-id-3695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3758' size-in-bits='64' id='type-id-3706'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3759' size-in-bits='64' id='type-id-3710'/>
+    <qualified-type-def type-id='type-id-3630' const='yes' id='type-id-3697'/>
+    <qualified-type-def type-id='type-id-3662' const='yes' id='type-id-3698'/>
+    <qualified-type-def type-id='type-id-3633' const='yes' id='type-id-3699'/>
+    <qualified-type-def type-id='type-id-3670' const='yes' id='type-id-3700'/>
+    <qualified-type-def type-id='type-id-3637' const='yes' id='type-id-3701'/>
+    <qualified-type-def type-id='type-id-3678' const='yes' id='type-id-3702'/>
+    <qualified-type-def type-id='type-id-3644' const='yes' id='type-id-3703'/>
+    <qualified-type-def type-id='type-id-3686' const='yes' id='type-id-3704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3760' size-in-bits='64' id='type-id-3718'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3761' size-in-bits='64' id='type-id-3720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3762' size-in-bits='64' id='type-id-3725'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3763' size-in-bits='64' id='type-id-3727'/>
+    <pointer-type-def type-id='type-id-3764' size-in-bits='64' id='type-id-3693'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3659' size-in-bits='64' id='type-id-3696'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3649' size-in-bits='64' id='type-id-3717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3708'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3661' size-in-bits='64' id='type-id-3707'/>
+    <pointer-type-def type-id='type-id-3661' size-in-bits='64' id='type-id-3705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3669' size-in-bits='64' id='type-id-3712'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3669' size-in-bits='64' id='type-id-3711'/>
+    <pointer-type-def type-id='type-id-3669' size-in-bits='64' id='type-id-3709'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3677' size-in-bits='64' id='type-id-3716'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3677' size-in-bits='64' id='type-id-3722'/>
+    <pointer-type-def type-id='type-id-3677' size-in-bits='64' id='type-id-3721'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3715' size-in-bits='64' id='type-id-3719'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3685' size-in-bits='64' id='type-id-3724'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3685' size-in-bits='64' id='type-id-3729'/>
+    <pointer-type-def type-id='type-id-3685' size-in-bits='64' id='type-id-3728'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3723' size-in-bits='64' id='type-id-3726'/>
     <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-3719'>
+      <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-3714'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_head_impl' type-id='type-id-3654' 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-3649' 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-3770' is-artificial='yes'/>
+            <parameter type-id='type-id-3765' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3770' is-artificial='yes'/>
-            <parameter type-id='type-id-3644'/>
+            <parameter type-id='type-id-3765' is-artificial='yes'/>
+            <parameter type-id='type-id-3639'/>
             <return type-id='type-id-11'/>
           </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-3770' is-artificial='yes'/>
-            <parameter type-id='type-id-3771'/>
+            <parameter type-id='type-id-3765' is-artificial='yes'/>
+            <parameter type-id='type-id-3766'/>
             <return type-id='type-id-11'/>
           </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-3770' is-artificial='yes'/>
-            <parameter type-id='type-id-3772'/>
+            <parameter type-id='type-id-3765' is-artificial='yes'/>
+            <parameter type-id='type-id-3767'/>
             <return type-id='type-id-11'/>
           </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-3770' is-artificial='yes'/>
+            <parameter type-id='type-id-3765' is-artificial='yes'/>
             <parameter type-id='type-id-424'/>
             <parameter type-id='type-id-425'/>
             <return type-id='type-id-11'/>
@@ -37410,355 +37405,355 @@
         </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-3773'/>
-            <return type-id='type-id-3722'/>
+            <parameter type-id='type-id-3768'/>
+            <return type-id='type-id-3717'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm1EPN5mongo4repl19ScatterGatherRunnerELb0EE7_M_headERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3771'/>
-            <return type-id='type-id-3644'/>
+            <parameter type-id='type-id-3766'/>
+            <return type-id='type-id-3639'/>
           </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-3770' is-artificial='yes'/>
-            <parameter type-id='type-id-3621'/>
+            <parameter type-id='type-id-3765' is-artificial='yes'/>
+            <parameter type-id='type-id-3616'/>
             <return type-id='type-id-11'/>
           </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-3718'>
+      <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-3713'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1369'/>
-        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3774'/>
+        <base-class access='private' layout-offset-in-bits='0' type-id='type-id-3769'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-1369' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3775'/>
+          <typedef-decl name='_Inherited' type-id='type-id-1369' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3770'/>
         </member-type>
         <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-3776'/>
-            <return type-id='type-id-3777'/>
+            <parameter type-id='type-id-3771'/>
+            <return type-id='type-id-3772'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_headERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3778'/>
-            <return type-id='type-id-3645'/>
+            <parameter type-id='type-id-3773'/>
+            <return type-id='type-id-3640'/>
           </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-3776'/>
-            <return type-id='type-id-3779'/>
+            <parameter type-id='type-id-3771'/>
+            <return type-id='type-id-3774'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_tailERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3778'/>
-            <return type-id='type-id-3780'/>
+            <parameter type-id='type-id-3773'/>
+            <return type-id='type-id-3775'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3781' is-artificial='yes'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3645'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-11'/>
           </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-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3778'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3773'/>
             <return type-id='type-id-11'/>
           </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-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3782'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3777'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEaSERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3778'/>
-            <return type-id='type-id-3776'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3773'/>
+            <return type-id='type-id-3771'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEEaSEOS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3782'/>
-            <return type-id='type-id-3776'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3777'/>
+            <return type-id='type-id-3771'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm2EJPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEEEE7_M_swapERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3776'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3771'/>
             <return type-id='type-id-11'/>
           </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-3781' is-artificial='yes'/>
-            <parameter type-id='type-id-3626'/>
+            <parameter type-id='type-id-3776' is-artificial='yes'/>
+            <parameter type-id='type-id-3621'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <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-3742'>
+      <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-3737'>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3784' 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-3783'/>
+          <typedef-decl name='reference' type-id='type-id-3779' 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-3778'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-3786' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3785'/>
+          <typedef-decl name='pointer' type-id='type-id-3781' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3780'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-3788' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-3787'/>
+          <typedef-decl name='difference_type' type-id='type-id-3783' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-3782'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-2633' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS6_'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
-            <parameter type-id='type-id-3790'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
+            <parameter type-id='type-id-3785'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3791' is-artificial='yes'/>
-            <return type-id='type-id-3783'/>
+            <parameter type-id='type-id-3786' is-artificial='yes'/>
+            <return type-id='type-id-3778'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3791' is-artificial='yes'/>
-            <return type-id='type-id-3785'/>
+            <parameter type-id='type-id-3786' is-artificial='yes'/>
+            <return type-id='type-id-3780'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
-            <return type-id='type-id-3792'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
+            <return type-id='type-id-3787'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEi' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-3742'/>
+            <return type-id='type-id-3737'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmmEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
-            <return type-id='type-id-3792'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
+            <return type-id='type-id-3787'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmmEi' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-3742'/>
+            <return type-id='type-id-3737'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEixEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3791' is-artificial='yes'/>
-            <parameter type-id='type-id-3787'/>
-            <return type-id='type-id-3783'/>
+            <parameter type-id='type-id-3786' is-artificial='yes'/>
+            <parameter type-id='type-id-3782'/>
+            <return type-id='type-id-3778'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEpLEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='777' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
-            <parameter type-id='type-id-3787'/>
-            <return type-id='type-id-3792'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
+            <parameter type-id='type-id-3782'/>
+            <return type-id='type-id-3787'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEplEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3791' is-artificial='yes'/>
-            <parameter type-id='type-id-3787'/>
-            <return type-id='type-id-3742'/>
+            <parameter type-id='type-id-3786' is-artificial='yes'/>
+            <parameter type-id='type-id-3782'/>
+            <return type-id='type-id-3737'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmIEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='785' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3789' is-artificial='yes'/>
-            <parameter type-id='type-id-3787'/>
-            <return type-id='type-id-3792'/>
+            <parameter type-id='type-id-3784' is-artificial='yes'/>
+            <parameter type-id='type-id-3782'/>
+            <return type-id='type-id-3787'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmiEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3791' is-artificial='yes'/>
-            <parameter type-id='type-id-3787'/>
-            <return type-id='type-id-3742'/>
+            <parameter type-id='type-id-3786' is-artificial='yes'/>
+            <parameter type-id='type-id-3782'/>
+            <return type-id='type-id-3737'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv'>
-            <parameter type-id='type-id-3791' is-artificial='yes'/>
-            <return type-id='type-id-3790'/>
+            <parameter type-id='type-id-3786' is-artificial='yes'/>
+            <return type-id='type-id-3785'/>
           </function-decl>
         </member-function>
       </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-3740'>
+      <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-3735'>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3794' 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-3793'/>
+          <typedef-decl name='reference' type-id='type-id-3789' 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-3788'/>
         </member-type>
         <member-type access='private'>
-          <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/stl_iterator.h' line='722' column='1' id='type-id-3795'/>
+          <typedef-decl name='pointer' type-id='type-id-3791' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='722' column='1' id='type-id-3790'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-3798' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-3797'/>
+          <typedef-decl name='difference_type' type-id='type-id-3793' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='720' column='1' id='type-id-3792'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-2632' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='712' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='__normal_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='724' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='__normal_iterator' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEC2ERKS5_'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
-            <parameter type-id='type-id-3800'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
+            <parameter type-id='type-id-3795'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEdeEv'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <return type-id='type-id-3793'/>
+            <parameter type-id='type-id-3796' is-artificial='yes'/>
+            <return type-id='type-id-3788'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='745' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <return type-id='type-id-3795'/>
+            <parameter type-id='type-id-3796' is-artificial='yes'/>
+            <return type-id='type-id-3790'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEv'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
-            <return type-id='type-id-3802'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
+            <return type-id='type-id-3797'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEppEi' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='756' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-3740'/>
+            <return type-id='type-id-3735'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmmEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
-            <return type-id='type-id-3802'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
+            <return type-id='type-id-3797'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmmEi' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-3740'/>
+            <return type-id='type-id-3735'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEixEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='773' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
-            <return type-id='type-id-3793'/>
+            <parameter type-id='type-id-3796' is-artificial='yes'/>
+            <parameter type-id='type-id-3792'/>
+            <return type-id='type-id-3788'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEpLEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='777' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
-            <return type-id='type-id-3802'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
+            <parameter type-id='type-id-3792'/>
+            <return type-id='type-id-3797'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEplEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='781' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
-            <return type-id='type-id-3740'/>
+            <parameter type-id='type-id-3796' is-artificial='yes'/>
+            <parameter type-id='type-id-3792'/>
+            <return type-id='type-id-3735'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-=' mangled-name='_ZN9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmIEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='785' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3799' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
-            <return type-id='type-id-3802'/>
+            <parameter type-id='type-id-3794' is-artificial='yes'/>
+            <parameter type-id='type-id-3792'/>
+            <return type-id='type-id-3797'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEmiEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='789' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <parameter type-id='type-id-3797'/>
-            <return type-id='type-id-3740'/>
+            <parameter type-id='type-id-3796' is-artificial='yes'/>
+            <parameter type-id='type-id-3792'/>
+            <return type-id='type-id-3735'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='base' mangled-name='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx17__normal_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEE4baseEv'>
-            <parameter type-id='type-id-3801' is-artificial='yes'/>
-            <return type-id='type-id-3800'/>
+            <parameter type-id='type-id-3796' is-artificial='yes'/>
+            <return type-id='type-id-3795'/>
           </function-decl>
         </member-function>
       </class-decl>
     </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-3769'>
+        <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-3764'>
           <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-3803' is-artificial='yes'/>
-              <return type-id='type-id-3804'/>
+              <parameter type-id='type-id-3798' is-artificial='yes'/>
+              <return type-id='type-id-3799'/>
             </function-decl>
           </member-function>
           <member-function access='protected' destructor='yes' vtable-offset='0'>
             <function-decl name='~ScatterGatherAlgorithm' mangled-name='_ZN5mongo4repl22ScatterGatherAlgorithmD0Ev' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='76' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo4repl22ScatterGatherAlgorithmD1Ev'>
-              <parameter type-id='type-id-3698' is-artificial='yes'/>
+              <parameter type-id='type-id-3693' is-artificial='yes'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='1'>
             <function-decl name='processResponse' mangled-name='_ZN5mongo4repl22ScatterGatherAlgorithm15processResponseERKNS_8executor20RemoteCommandRequestERKNS_10StatusWithINS2_21RemoteCommandResponseEEE' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3698' is-artificial='yes'/>
+              <parameter type-id='type-id-3693' is-artificial='yes'/>
               <parameter type-id='type-id-1245'/>
-              <parameter type-id='type-id-3805'/>
+              <parameter type-id='type-id-3800'/>
               <return type-id='type-id-11'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='hasReceivedSufficientResponses' mangled-name='_ZNK5mongo4repl22ScatterGatherAlgorithm30hasReceivedSufficientResponsesEv' filepath='src/mongo/db/repl/scatter_gather_algorithm.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-3803' is-artificial='yes'/>
+              <parameter type-id='type-id-3798' is-artificial='yes'/>
               <return type-id='type-id-19'/>
             </function-decl>
           </member-function>
@@ -37766,115 +37761,115 @@
       </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-3737'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3806'/>
+      <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-3732'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3801'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-1019' 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-3807'/>
+          <typedef-decl name='value_type' type-id='type-id-1019' 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-3802'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2632' 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-3808'/>
+          <typedef-decl name='pointer' type-id='type-id-2632' 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-3803'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-66' 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-3809'/>
+          <typedef-decl name='size_type' type-id='type-id-66' 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-3804'/>
         </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-3810'>
+          <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-3805'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3737' 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-3811'/>
+              <typedef-decl name='other' type-id='type-id-3732' 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-3806'/>
             </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-3812' is-artificial='yes'/>
+            <parameter type-id='type-id-3807' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3812' is-artificial='yes'/>
-            <parameter type-id='type-id-3813'/>
+            <parameter type-id='type-id-3807' is-artificial='yes'/>
+            <parameter type-id='type-id-3808'/>
             <return type-id='type-id-11'/>
           </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-3812' is-artificial='yes'/>
+            <parameter type-id='type-id-3807' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3758'/>
+      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3753'/>
     </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-3746'/>
+      <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-3741'/>
     </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-3744'/>
+      <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-3739'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-3664' const='yes' id='type-id-3762'/>
-    <qualified-type-def type-id='type-id-3666' const='yes' id='type-id-3763'/>
-    <qualified-type-def type-id='type-id-3674' const='yes' id='type-id-3764'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3814' size-in-bits='64' id='type-id-3771'/>
-    <qualified-type-def type-id='type-id-3682' const='yes' id='type-id-3765'/>
-    <qualified-type-def type-id='type-id-3720' const='yes' id='type-id-3766'/>
-    <qualified-type-def type-id='type-id-3690' const='yes' id='type-id-3767'/>
-    <qualified-type-def type-id='type-id-3728' const='yes' id='type-id-3768'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3815' size-in-bits='64' id='type-id-3778'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3816' size-in-bits='64' id='type-id-3780'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3817' size-in-bits='64' id='type-id-3756'/>
-    <pointer-type-def type-id='type-id-3817' size-in-bits='64' id='type-id-3760'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3818' size-in-bits='64' id='type-id-3754'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3755'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2784' size-in-bits='64' id='type-id-3777'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3719' size-in-bits='64' id='type-id-3773'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3719' size-in-bits='64' id='type-id-3772'/>
-    <pointer-type-def type-id='type-id-3719' size-in-bits='64' id='type-id-3770'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3718' size-in-bits='64' id='type-id-3776'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3718' size-in-bits='64' id='type-id-3782'/>
-    <pointer-type-def type-id='type-id-3718' size-in-bits='64' id='type-id-3781'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3775' size-in-bits='64' id='type-id-3779'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3699' size-in-bits='64' id='type-id-3759'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3699' size-in-bits='64' id='type-id-3757'/>
-    <pointer-type-def type-id='type-id-3699' size-in-bits='64' id='type-id-3753'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3738' size-in-bits='64' id='type-id-3761'/>
+    <qualified-type-def type-id='type-id-3659' const='yes' id='type-id-3757'/>
+    <qualified-type-def type-id='type-id-3661' const='yes' id='type-id-3758'/>
+    <qualified-type-def type-id='type-id-3669' const='yes' id='type-id-3759'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3809' size-in-bits='64' id='type-id-3766'/>
+    <qualified-type-def type-id='type-id-3677' const='yes' id='type-id-3760'/>
+    <qualified-type-def type-id='type-id-3715' const='yes' id='type-id-3761'/>
+    <qualified-type-def type-id='type-id-3685' const='yes' id='type-id-3762'/>
+    <qualified-type-def type-id='type-id-3723' const='yes' id='type-id-3763'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3810' size-in-bits='64' id='type-id-3773'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3811' size-in-bits='64' id='type-id-3775'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3812' size-in-bits='64' id='type-id-3751'/>
+    <pointer-type-def type-id='type-id-3812' size-in-bits='64' id='type-id-3755'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3813' size-in-bits='64' id='type-id-3749'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3814' size-in-bits='64' id='type-id-3750'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2784' size-in-bits='64' id='type-id-3772'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3714' size-in-bits='64' id='type-id-3768'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3714' size-in-bits='64' id='type-id-3767'/>
+    <pointer-type-def type-id='type-id-3714' size-in-bits='64' id='type-id-3765'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3713' size-in-bits='64' id='type-id-3771'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3713' size-in-bits='64' id='type-id-3777'/>
+    <pointer-type-def type-id='type-id-3713' size-in-bits='64' id='type-id-3776'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3770' size-in-bits='64' id='type-id-3774'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3754'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3694' size-in-bits='64' id='type-id-3752'/>
+    <pointer-type-def type-id='type-id-3694' size-in-bits='64' id='type-id-3748'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3733' size-in-bits='64' id='type-id-3756'/>
     <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-3774'>
+      <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-3769'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_head_impl' type-id='type-id-2784' 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-3820' is-artificial='yes'/>
+            <parameter type-id='type-id-3815' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3820' is-artificial='yes'/>
-            <parameter type-id='type-id-3645'/>
+            <parameter type-id='type-id-3815' is-artificial='yes'/>
+            <parameter type-id='type-id-3640'/>
             <return type-id='type-id-11'/>
           </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-3820' is-artificial='yes'/>
-            <parameter type-id='type-id-3821'/>
+            <parameter type-id='type-id-3815' is-artificial='yes'/>
+            <parameter type-id='type-id-3816'/>
             <return type-id='type-id-11'/>
           </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-3820' is-artificial='yes'/>
-            <parameter type-id='type-id-3822'/>
+            <parameter type-id='type-id-3815' is-artificial='yes'/>
+            <parameter type-id='type-id-3817'/>
             <return type-id='type-id-11'/>
           </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-3820' is-artificial='yes'/>
+            <parameter type-id='type-id-3815' is-artificial='yes'/>
             <parameter type-id='type-id-424'/>
             <parameter type-id='type-id-425'/>
             <return type-id='type-id-11'/>
@@ -37882,172 +37877,172 @@
         </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-3823'/>
-            <return type-id='type-id-3777'/>
+            <parameter type-id='type-id-3818'/>
+            <return type-id='type-id-3772'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt10_Head_baseILm2EPN5mongo10StatusWithINS0_8executor12TaskExecutor11EventHandleEEELb0EE7_M_headERKS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3821'/>
-            <return type-id='type-id-3645'/>
+            <parameter type-id='type-id-3816'/>
+            <return type-id='type-id-3640'/>
           </function-decl>
         </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-3820' is-artificial='yes'/>
-            <parameter type-id='type-id-3626'/>
+            <parameter type-id='type-id-3815' is-artificial='yes'/>
+            <parameter type-id='type-id-3621'/>
             <return type-id='type-id-11'/>
           </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-3735'>
+      <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-3730'>
         <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-3824'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3737'/>
+          <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-3819'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3732'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3752' 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-3747' 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-3752' 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-3747' 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-3752' 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-3747' 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-3825' is-artificial='yes'/>
+                <parameter type-id='type-id-3820' is-artificial='yes'/>
                 <return type-id='type-id-11'/>
               </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-3825' is-artificial='yes'/>
-                <parameter type-id='type-id-3826'/>
+                <parameter type-id='type-id-3820' is-artificial='yes'/>
+                <parameter type-id='type-id-3821'/>
                 <return type-id='type-id-11'/>
               </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-3825' is-artificial='yes'/>
-                <parameter type-id='type-id-3827'/>
+                <parameter type-id='type-id-3820' is-artificial='yes'/>
+                <parameter type-id='type-id-3822'/>
                 <return type-id='type-id-11'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_swap_data' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE12_Vector_impl12_M_swap_dataERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3825' is-artificial='yes'/>
-                <parameter type-id='type-id-3828'/>
+                <parameter type-id='type-id-3820' is-artificial='yes'/>
+                <parameter type-id='type-id-3823'/>
                 <return type-id='type-id-11'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3830' 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-3829'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3825' 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-3824'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3831' 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-3752'/>
+          <typedef-decl name='pointer' type-id='type-id-3826' 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-3747'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' 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='110' column='1' id='type-id-3832'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3732' 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-3827'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3824' 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-3819' 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='_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-3833' is-artificial='yes'/>
-            <return type-id='type-id-3834'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
+            <return type-id='type-id-3829'/>
           </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-3835' is-artificial='yes'/>
-            <return type-id='type-id-3826'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <return type-id='type-id-3821'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE13get_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3835' is-artificial='yes'/>
-            <return type-id='type-id-3832'/>
+            <parameter type-id='type-id-3830' is-artificial='yes'/>
+            <return type-id='type-id-3827'/>
           </function-decl>
         </member-function>
         <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-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
-            <parameter type-id='type-id-3836'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
+            <parameter type-id='type-id-3831'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-3836'/>
+            <parameter type-id='type-id-3831'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
-            <parameter type-id='type-id-3827'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
+            <parameter type-id='type-id-3822'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
-            <parameter type-id='type-id-3837'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
+            <parameter type-id='type-id-3832'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
-            <parameter type-id='type-id-3837'/>
-            <parameter type-id='type-id-3836'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
+            <parameter type-id='type-id-3832'/>
+            <parameter type-id='type-id-3831'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
-            <return type-id='type-id-3752'/>
+            <return type-id='type-id-3747'/>
           </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-3833' is-artificial='yes'/>
-            <parameter type-id='type-id-3752'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
+            <parameter type-id='type-id-3747'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_create_storage' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor12TaskExecutor14CallbackHandleESaIS3_EE17_M_create_storageEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3833' is-artificial='yes'/>
+            <parameter type-id='type-id-3828' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-11'/>
           </function-decl>
@@ -38055,103 +38050,103 @@
       </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-3838'>
+      <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-3833'>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3839' 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-3750'/>
+          <typedef-decl name='const_reference' type-id='type-id-3834' 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-3745'/>
         </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-3838'>
+      <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-3833'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3840' 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-3748'/>
+          <typedef-decl name='reference' type-id='type-id-3835' 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-3743'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3841' size-in-bits='64' id='type-id-3840'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3742' size-in-bits='64' id='type-id-3792'/>
-    <pointer-type-def type-id='type-id-3742' size-in-bits='64' id='type-id-3789'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3740' size-in-bits='64' id='type-id-3802'/>
-    <pointer-type-def type-id='type-id-3740' size-in-bits='64' id='type-id-3799'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3836' size-in-bits='64' id='type-id-3835'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3737' size-in-bits='64' id='type-id-3787'/>
+    <pointer-type-def type-id='type-id-3737' size-in-bits='64' id='type-id-3784'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3735' size-in-bits='64' id='type-id-3797'/>
+    <pointer-type-def type-id='type-id-3735' size-in-bits='64' id='type-id-3794'/>
     <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-3806'>
+      <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-3801'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2632' 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-3842'/>
+          <typedef-decl name='pointer' type-id='type-id-2632' 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-3837'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3843'/>
+          <typedef-decl name='reference' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3838'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3844'/>
+          <typedef-decl name='const_pointer' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3839'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3845'/>
+          <typedef-decl name='const_reference' type-id='type-id-946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3840'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEEC2Ev'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
-            <parameter type-id='type-id-3847'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3842'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEED2Ev'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7addressERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3848' is-artificial='yes'/>
-            <parameter type-id='type-id-3843'/>
-            <return type-id='type-id-3842'/>
+            <parameter type-id='type-id-3843' is-artificial='yes'/>
+            <parameter type-id='type-id-3838'/>
+            <return type-id='type-id-3837'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7addressERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3848' is-artificial='yes'/>
-            <parameter type-id='type-id-3845'/>
-            <return type-id='type-id-3844'/>
+            <parameter type-id='type-id-3843' is-artificial='yes'/>
+            <parameter type-id='type-id-3840'/>
+            <return type-id='type-id-3839'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8allocateEmPKv'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <parameter type-id='type-id-286'/>
-            <return type-id='type-id-3842'/>
+            <return type-id='type-id-3837'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE10deallocateEPS4_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE10deallocateEPS4_m'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
-            <parameter type-id='type-id-3842'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
+            <parameter type-id='type-id-3837'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE8max_sizeEv'>
-            <parameter type-id='type-id-3848' is-artificial='yes'/>
+            <parameter type-id='type-id-3843' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyIS4_EEvPT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE7destroyIS4_EEvPT_'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
             <parameter type-id='type-id-2632'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructIS4_JRKS4_EEEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor12TaskExecutor14CallbackHandleEE9constructIS4_JRKS4_EEEvPT_DpOT0_'>
-            <parameter type-id='type-id-3846' is-artificial='yes'/>
+            <parameter type-id='type-id-3841' is-artificial='yes'/>
             <parameter type-id='type-id-2632'/>
             <parameter type-id='type-id-946'/>
             <return type-id='type-id-11'/>
@@ -38160,469 +38155,469 @@
       </class-decl>
     </namespace-decl>
     <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-3804'>
-        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3849'/>
+      <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-3799'>
+        <base-class access='protected' layout-offset-in-bits='0' type-id='type-id-3844'/>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-3851' 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-3850'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3846' 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-3845'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-1314' 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-3852'/>
+          <typedef-decl name='value_type' type-id='type-id-1314' 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-3847'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3854' 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-3853'/>
+          <typedef-decl name='iterator' type-id='type-id-3849' 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-3848'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3856' 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-3855'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3851' 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-3850'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3858' 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-3857'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3853' 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-3852'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3860' 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-3859'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3855' 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-3854'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-3862' 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-3861'/>
+          <typedef-decl name='reference' type-id='type-id-3857' 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-3856'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3864' 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-3863'/>
+          <typedef-decl name='const_reference' type-id='type-id-3859' 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-3858'/>
         </member-type>
         <member-type access='private'>
-          <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='227' column='1' id='type-id-3865'/>
+          <typedef-decl name='pointer' type-id='type-id-3861' 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-3860'/>
         </member-type>
         <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='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3868'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3868'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
-            <parameter type-id='type-id-3868'/>
+            <parameter type-id='type-id-3864'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3870'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3865'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3871'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3866'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3870'/>
-            <parameter type-id='type-id-3868'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3865'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3871'/>
-            <parameter type-id='type-id-3868'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3866'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-11'/>
           </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-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3872'/>
-            <parameter type-id='type-id-3868'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3867'/>
+            <parameter type-id='type-id-3863'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~vector' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EED2Ev'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEaSERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3870'/>
-            <return type-id='type-id-3873'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3865'/>
+            <return type-id='type-id-3868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEaSEOS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='448' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3871'/>
-            <return type-id='type-id-3873'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3866'/>
+            <return type-id='type-id-3868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEaSESt16initializer_listIS2_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='470' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3872'/>
-            <return type-id='type-id-3873'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3867'/>
+            <return type-id='type-id-3868'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='assign' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6assignEmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3864'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='assign' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6assignESt16initializer_listIS2_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='533' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3872'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3867'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3855'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3850'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3855'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3850'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rbegin' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6rbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='583' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <return type-id='type-id-3857'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <return type-id='type-id-3852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rbegin' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6rbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='592' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3859'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rend' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4rendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='601' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <return type-id='type-id-3857'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <return type-id='type-id-3852'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='rend' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4rendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3859'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cbegin' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6cbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3855'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3850'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='cend' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4cendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3855'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3850'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='crbegin' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE7crbeginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3859'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='crend' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE5crendEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3859'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3854'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4sizeEv'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6resizeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='673' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='resize' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6resizeEmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3864'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='shrink_to_fit' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE13shrink_to_fitEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='725' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='capacity' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE8capacityEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='734' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='empty' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <return type-id='type-id-19'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='reserve' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE7reserveEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='764' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3861'/>
+            <return type-id='type-id-3856'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EEixEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3863'/>
+            <return type-id='type-id-3858'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_range_check' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE14_M_range_checkEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='800' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='at' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE2atEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='822' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3861'/>
+            <return type-id='type-id-3856'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='at' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE2atEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='840' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <return type-id='type-id-3863'/>
+            <return type-id='type-id-3858'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='front' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE5frontEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='851' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <return type-id='type-id-3861'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <return type-id='type-id-3856'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='front' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE5frontEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='859' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3863'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3858'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='back' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='867' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <return type-id='type-id-3861'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <return type-id='type-id-3856'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='back' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='875' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
-            <return type-id='type-id-3863'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
+            <return type-id='type-id-3858'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-2646'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='data' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4dataEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='898' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <return type-id='type-id-2649'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE9push_backERKS2_' 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'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3864'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='push_back' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE9push_backEOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='931' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3875'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3870'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='pop_back' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE8pop_backEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='949' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EERS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='984' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3855'/>
-            <parameter type-id='type-id-3869'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3850'/>
+            <parameter type-id='type-id-3864'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EEOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1014' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3855'/>
-            <parameter type-id='type-id-3875'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3850'/>
+            <parameter type-id='type-id-3870'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EESt16initializer_listIS2_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1031' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3855'/>
-            <parameter type-id='type-id-3872'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3850'/>
+            <parameter type-id='type-id-3867'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='insert' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE6insertEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EEmRS7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1051' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3855'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3850'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3864'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE5eraseEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1146' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3855'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3850'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='erase' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE5eraseEN9__gnu_cxx17__normal_iteratorIPKS2_S4_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1173' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3855'/>
-            <parameter type-id='type-id-3855'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3850'/>
+            <parameter type-id='type-id-3850'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE4swapERS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1194' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3873'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3868'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='clear' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE5clearEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1211' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_initialize' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE18_M_fill_initializeEmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1298' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3864'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_initialize' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE21_M_default_initializeEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1308' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_assign' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE14_M_fill_assignEmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3864'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_fill_insert' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPS2_S4_EEmRKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1395' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3848'/>
             <parameter type-id='type-id-230'/>
-            <parameter type-id='type-id-3869'/>
+            <parameter type-id='type-id-3864'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_default_append' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE17_M_default_appendEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1400' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_shrink_to_fit' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE16_M_shrink_to_fitEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1403' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
             <return type-id='type-id-19'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_check_len' mangled-name='_ZNKSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3874' is-artificial='yes'/>
+            <parameter type-id='type-id-3869' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <parameter type-id='type-id-240'/>
             <return type-id='type-id-230'/>
@@ -38630,402 +38625,402 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase_at_end' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE15_M_erase_at_endEPS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1436' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3865'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3860'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS2_S4_EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1443' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3853'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3848'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_erase' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE8_M_eraseEN9__gnu_cxx17__normal_iteratorIPS2_S4_EES8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1446' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3853'/>
-            <parameter type-id='type-id-3853'/>
-            <return type-id='type-id-3853'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3848'/>
+            <parameter type-id='type-id-3848'/>
+            <return type-id='type-id-3848'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_move_assign' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE14_M_move_assignEOS4_St17integral_constantIbLb1EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1454' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3871'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3866'/>
             <parameter type-id='type-id-241'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_move_assign' mangled-name='_ZNSt6vectorIN5mongo8executor20RemoteCommandRequestESaIS2_EE14_M_move_assignEOS4_St17integral_constantIbLb0EE' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='1465' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3867' is-artificial='yes'/>
-            <parameter type-id='type-id-3871'/>
+            <parameter type-id='type-id-3862' is-artificial='yes'/>
+            <parameter type-id='type-id-3866'/>
             <parameter type-id='type-id-242'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3876' size-in-bits='64' id='type-id-3839'/>
-    <pointer-type-def type-id='type-id-3877' size-in-bits='64' id='type-id-3791'/>
-    <pointer-type-def type-id='type-id-3878' size-in-bits='64' id='type-id-3801'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3879' size-in-bits='64' id='type-id-3790'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3880' size-in-bits='64' id='type-id-3805'/>
-    <pointer-type-def type-id='type-id-3881' size-in-bits='64' id='type-id-3803'/>
-    <qualified-type-def type-id='type-id-3719' const='yes' id='type-id-3814'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3882' size-in-bits='64' id='type-id-3821'/>
-    <qualified-type-def type-id='type-id-3718' const='yes' id='type-id-3815'/>
-    <qualified-type-def type-id='type-id-3775' const='yes' id='type-id-3816'/>
-    <pointer-type-def type-id='type-id-3883' size-in-bits='64' id='type-id-3835'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3884' size-in-bits='64' id='type-id-3826'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3885' size-in-bits='64' id='type-id-3836'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3886' size-in-bits='64' id='type-id-3813'/>
-    <qualified-type-def type-id='type-id-3699' const='yes' id='type-id-3817'/>
-    <qualified-type-def type-id='type-id-3736' const='yes' id='type-id-3818'/>
-    <qualified-type-def type-id='type-id-3738' const='yes' id='type-id-3819'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3887' size-in-bits='64' id='type-id-3800'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3774' size-in-bits='64' id='type-id-3823'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3774' size-in-bits='64' id='type-id-3822'/>
-    <pointer-type-def type-id='type-id-3774' size-in-bits='64' id='type-id-3820'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3735' size-in-bits='64' id='type-id-3837'/>
-    <pointer-type-def type-id='type-id-3735' size-in-bits='64' id='type-id-3833'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3829' size-in-bits='64' id='type-id-3834'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3829' size-in-bits='64' id='type-id-3827'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3824' size-in-bits='64' id='type-id-3828'/>
-    <pointer-type-def type-id='type-id-3824' size-in-bits='64' id='type-id-3825'/>
-    <pointer-type-def type-id='type-id-3737' size-in-bits='64' id='type-id-3812'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3871' size-in-bits='64' id='type-id-3834'/>
+    <pointer-type-def type-id='type-id-3872' size-in-bits='64' id='type-id-3786'/>
+    <pointer-type-def type-id='type-id-3873' size-in-bits='64' id='type-id-3796'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3874' size-in-bits='64' id='type-id-3785'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3875' size-in-bits='64' id='type-id-3800'/>
+    <pointer-type-def type-id='type-id-3876' size-in-bits='64' id='type-id-3798'/>
+    <qualified-type-def type-id='type-id-3714' const='yes' id='type-id-3809'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3877' size-in-bits='64' id='type-id-3816'/>
+    <qualified-type-def type-id='type-id-3713' const='yes' id='type-id-3810'/>
+    <qualified-type-def type-id='type-id-3770' const='yes' id='type-id-3811'/>
+    <pointer-type-def type-id='type-id-3878' size-in-bits='64' id='type-id-3830'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3879' size-in-bits='64' id='type-id-3821'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3880' size-in-bits='64' id='type-id-3831'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3881' size-in-bits='64' id='type-id-3808'/>
+    <qualified-type-def type-id='type-id-3694' const='yes' id='type-id-3812'/>
+    <qualified-type-def type-id='type-id-3731' const='yes' id='type-id-3813'/>
+    <qualified-type-def type-id='type-id-3733' const='yes' id='type-id-3814'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3882' size-in-bits='64' id='type-id-3795'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3769' size-in-bits='64' id='type-id-3818'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3769' size-in-bits='64' id='type-id-3817'/>
+    <pointer-type-def type-id='type-id-3769' size-in-bits='64' id='type-id-3815'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3730' size-in-bits='64' id='type-id-3832'/>
+    <pointer-type-def type-id='type-id-3730' size-in-bits='64' id='type-id-3828'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3824' size-in-bits='64' id='type-id-3829'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3824' size-in-bits='64' id='type-id-3822'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3819' size-in-bits='64' id='type-id-3823'/>
+    <pointer-type-def type-id='type-id-3819' size-in-bits='64' id='type-id-3820'/>
+    <pointer-type-def type-id='type-id-3732' size-in-bits='64' id='type-id-3807'/>
     <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-3838'>
+      <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-3833'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3888' 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-3831'/>
+          <typedef-decl name='pointer' type-id='type-id-3883' 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-3826'/>
         </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-3838'>
+      <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-3833'>
         <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-3889'>
+          <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-3884'>
             <member-type access='public'>
-              <typedef-decl name='other' 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='169' column='1' id='type-id-3830'/>
+              <typedef-decl name='other' type-id='type-id-3885' 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-3825'/>
             </member-type>
           </class-decl>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3891'>
+      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3886'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-3788'/>
+          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-3783'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3891'>
+      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3886'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-3786'/>
+          <typedef-decl name='pointer' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-3781'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3891'>
+      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3886'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-3784'/>
+          <typedef-decl name='reference' type-id='type-id-946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-3779'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3892'>
+      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3887'>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-3798'/>
+          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-3793'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3892'>
+      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3887'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3796'/>
+          <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3791'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3892'>
+      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3887'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3794'/>
+          <typedef-decl name='reference' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3789'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-3806' size-in-bits='64' id='type-id-3846'/>
+    <pointer-type-def type-id='type-id-3801' size-in-bits='64' id='type-id-3841'/>
     <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-3856'/>
+      <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-3851'/>
     </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-3854'/>
+      <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-3849'/>
     </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-3851'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3893'/>
+      <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-3846'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3888'/>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-1314' 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-3894'/>
+          <typedef-decl name='value_type' type-id='type-id-1314' 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-3889'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2646' 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-3895'/>
+          <typedef-decl name='pointer' type-id='type-id-2646' 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-3890'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-66' 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-3896'/>
+          <typedef-decl name='size_type' type-id='type-id-66' 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-3891'/>
         </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-3897'>
+          <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-3892'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3851' 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-3898'/>
+              <typedef-decl name='other' type-id='type-id-3846' 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-3893'/>
             </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-3899' is-artificial='yes'/>
+            <parameter type-id='type-id-3894' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3899' is-artificial='yes'/>
-            <parameter type-id='type-id-3900'/>
+            <parameter type-id='type-id-3894' is-artificial='yes'/>
+            <parameter type-id='type-id-3895'/>
             <return type-id='type-id-11'/>
           </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-3899' is-artificial='yes'/>
+            <parameter type-id='type-id-3894' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3872'>
+      <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-3867'>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3901'/>
+          <typedef-decl name='iterator' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='54' column='1' id='type-id-3896'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3902'/>
+          <typedef-decl name='const_iterator' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='55' column='1' id='type-id-3897'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-3901' 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-3896' 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-230' 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-3903' is-artificial='yes'/>
-            <parameter type-id='type-id-3902'/>
+            <parameter type-id='type-id-3898' is-artificial='yes'/>
+            <parameter type-id='type-id-3897'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </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-3903' is-artificial='yes'/>
+            <parameter type-id='type-id-3898' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='size' mangled-name='_ZNKSt16initializer_listIN5mongo8executor20RemoteCommandRequestEE4sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3904' is-artificial='yes'/>
+            <parameter type-id='type-id-3899' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='begin' mangled-name='_ZNKSt16initializer_listIN5mongo8executor20RemoteCommandRequestEE5beginEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3904' is-artificial='yes'/>
-            <return type-id='type-id-3902'/>
+            <parameter type-id='type-id-3899' is-artificial='yes'/>
+            <return type-id='type-id-3897'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='end' mangled-name='_ZNKSt16initializer_listIN5mongo8executor20RemoteCommandRequestEE3endEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/initializer_list' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3904' is-artificial='yes'/>
-            <return type-id='type-id-3902'/>
+            <parameter type-id='type-id-3899' is-artificial='yes'/>
+            <return type-id='type-id-3897'/>
           </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-3860'/>
+      <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-3855'/>
     </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-3858'/>
+      <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-3853'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-3841' const='yes' id='type-id-3876'/>
-    <qualified-type-def type-id='type-id-3742' const='yes' id='type-id-3877'/>
-    <qualified-type-def type-id='type-id-3740' const='yes' id='type-id-3878'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3905' size-in-bits='64' id='type-id-3847'/>
-    <pointer-type-def type-id='type-id-3905' size-in-bits='64' id='type-id-3848'/>
-    <qualified-type-def type-id='type-id-2633' const='yes' id='type-id-3879'/>
-    <qualified-type-def type-id='type-id-3906' const='yes' id='type-id-3880'/>
-    <qualified-type-def type-id='type-id-3769' const='yes' id='type-id-3881'/>
-    <qualified-type-def type-id='type-id-3774' const='yes' id='type-id-3882'/>
-    <qualified-type-def type-id='type-id-3735' const='yes' id='type-id-3883'/>
-    <qualified-type-def type-id='type-id-3829' const='yes' id='type-id-3884'/>
-    <qualified-type-def type-id='type-id-3832' const='yes' id='type-id-3885'/>
-    <qualified-type-def type-id='type-id-3737' const='yes' id='type-id-3886'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3907' size-in-bits='64' id='type-id-3870'/>
-    <pointer-type-def type-id='type-id-3907' size-in-bits='64' id='type-id-3874'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3908' size-in-bits='64' id='type-id-3868'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3909' size-in-bits='64' id='type-id-3869'/>
-    <qualified-type-def type-id='type-id-2632' const='yes' id='type-id-3887'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3804' size-in-bits='64' id='type-id-3873'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3804' size-in-bits='64' id='type-id-3871'/>
-    <pointer-type-def type-id='type-id-3804' size-in-bits='64' id='type-id-3867'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3852' size-in-bits='64' id='type-id-3875'/>
+    <qualified-type-def type-id='type-id-3836' const='yes' id='type-id-3871'/>
+    <qualified-type-def type-id='type-id-3737' const='yes' id='type-id-3872'/>
+    <qualified-type-def type-id='type-id-3735' const='yes' id='type-id-3873'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3900' size-in-bits='64' id='type-id-3842'/>
+    <pointer-type-def type-id='type-id-3900' size-in-bits='64' id='type-id-3843'/>
+    <qualified-type-def type-id='type-id-2633' const='yes' id='type-id-3874'/>
+    <qualified-type-def type-id='type-id-3901' const='yes' id='type-id-3875'/>
+    <qualified-type-def type-id='type-id-3764' const='yes' id='type-id-3876'/>
+    <qualified-type-def type-id='type-id-3769' const='yes' id='type-id-3877'/>
+    <qualified-type-def type-id='type-id-3730' const='yes' id='type-id-3878'/>
+    <qualified-type-def type-id='type-id-3824' const='yes' id='type-id-3879'/>
+    <qualified-type-def type-id='type-id-3827' const='yes' id='type-id-3880'/>
+    <qualified-type-def type-id='type-id-3732' const='yes' id='type-id-3881'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3902' size-in-bits='64' id='type-id-3865'/>
+    <pointer-type-def type-id='type-id-3902' size-in-bits='64' id='type-id-3869'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3903' size-in-bits='64' id='type-id-3863'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3904' size-in-bits='64' id='type-id-3864'/>
+    <qualified-type-def type-id='type-id-2632' const='yes' id='type-id-3882'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3799' size-in-bits='64' id='type-id-3868'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3799' size-in-bits='64' id='type-id-3866'/>
+    <pointer-type-def type-id='type-id-3799' size-in-bits='64' id='type-id-3862'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3847' size-in-bits='64' id='type-id-3870'/>
     <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-3849'>
+      <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-3844'>
         <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-3910'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3851'/>
+          <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-3905'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3846'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3866' 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-3861' 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-3866' 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-3861' 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-3866' 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-3861' 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' 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-3911' is-artificial='yes'/>
+                <parameter type-id='type-id-3906' is-artificial='yes'/>
                 <return type-id='type-id-11'/>
               </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-3911' is-artificial='yes'/>
-                <parameter type-id='type-id-3912'/>
+                <parameter type-id='type-id-3906' is-artificial='yes'/>
+                <parameter type-id='type-id-3907'/>
                 <return type-id='type-id-11'/>
               </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-3911' is-artificial='yes'/>
-                <parameter type-id='type-id-3913'/>
+                <parameter type-id='type-id-3906' is-artificial='yes'/>
+                <parameter type-id='type-id-3908'/>
                 <return type-id='type-id-11'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_swap_data' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE12_Vector_impl12_M_swap_dataERS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='101' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3911' is-artificial='yes'/>
-                <parameter type-id='type-id-3914'/>
+                <parameter type-id='type-id-3906' is-artificial='yes'/>
+                <parameter type-id='type-id-3909'/>
                 <return type-id='type-id-11'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3916' 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-3915'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3911' 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-3910'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3917' 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-3866'/>
+          <typedef-decl name='pointer' type-id='type-id-3912' 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-3861'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3851' 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-3918'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3846' 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-3913'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3910' 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-3905' 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='_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-3919' is-artificial='yes'/>
-            <return type-id='type-id-3920'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
+            <return type-id='type-id-3915'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_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='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3921' is-artificial='yes'/>
-            <return type-id='type-id-3912'/>
+            <parameter type-id='type-id-3916' is-artificial='yes'/>
+            <return type-id='type-id-3907'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE13get_allocatorEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3921' is-artificial='yes'/>
-            <return type-id='type-id-3918'/>
+            <parameter type-id='type-id-3916' is-artificial='yes'/>
+            <return type-id='type-id-3913'/>
           </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='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3919' is-artificial='yes'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
-            <parameter type-id='type-id-3922'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
+            <parameter type-id='type-id-3917'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-3922'/>
+            <parameter type-id='type-id-3917'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
-            <parameter type-id='type-id-3913'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
+            <parameter type-id='type-id-3908'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
-            <parameter type-id='type-id-3923'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
+            <parameter type-id='type-id-3918'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
-            <parameter type-id='type-id-3923'/>
-            <parameter type-id='type-id-3922'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
+            <parameter type-id='type-id-3918'/>
+            <parameter type-id='type-id-3917'/>
             <return type-id='type-id-11'/>
           </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-3919' is-artificial='yes'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_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'>
-            <parameter type-id='type-id-3919' is-artificial='yes'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
-            <return type-id='type-id-3866'/>
+            <return type-id='type-id-3861'/>
           </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-3919' is-artificial='yes'/>
-            <parameter type-id='type-id-3866'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
+            <parameter type-id='type-id-3861'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_create_storage' mangled-name='_ZNSt12_Vector_baseIN5mongo8executor20RemoteCommandRequestESaIS2_EE17_M_create_storageEm' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_vector.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3919' is-artificial='yes'/>
+            <parameter type-id='type-id-3914' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-11'/>
           </function-decl>
@@ -39033,143 +39028,143 @@
       </class-decl>
     </namespace-decl>
     <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-3924'>
+      <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-3919'>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3925' 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-3864'/>
+          <typedef-decl name='const_reference' type-id='type-id-3920' 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-3859'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <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-3924'>
+      <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-3919'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3926' 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-3862'/>
+          <typedef-decl name='reference' type-id='type-id-3921' 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-3857'/>
         </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-3838'>
+      <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-3833'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3927' 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-3841'/>
+          <typedef-decl name='value_type' type-id='type-id-3922' 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-3836'/>
         </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-3928'>
+      <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-3923'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3929' 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-3888'/>
+          <typedef-decl name='pointer' type-id='type-id-3924' 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-3883'/>
         </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-3928'>
+      <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-3923'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3930' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3890'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3925' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3885'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3931' size-in-bits='64' id='type-id-3926'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3926' size-in-bits='64' id='type-id-3921'/>
     <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-3893'>
+      <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-3888'>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2646' 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-3932'/>
+          <typedef-decl name='pointer' type-id='type-id-2646' 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-3927'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-1186' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3933'/>
+          <typedef-decl name='reference' type-id='type-id-1186' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='65' column='1' id='type-id-3928'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_pointer' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3934'/>
+          <typedef-decl name='const_pointer' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='64' column='1' id='type-id-3929'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-1245' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3935'/>
+          <typedef-decl name='const_reference' type-id='type-id-1245' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='66' column='1' id='type-id-3930'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3936' is-artificial='yes'/>
+            <parameter type-id='type-id-3931' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3936' is-artificial='yes'/>
-            <parameter type-id='type-id-3937'/>
+            <parameter type-id='type-id-3931' is-artificial='yes'/>
+            <parameter type-id='type-id-3932'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEED2Ev' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEED2Ev'>
-            <parameter type-id='type-id-3936' is-artificial='yes'/>
+            <parameter type-id='type-id-3931' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE7addressERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3938' is-artificial='yes'/>
-            <parameter type-id='type-id-3933'/>
-            <return type-id='type-id-3932'/>
+            <parameter type-id='type-id-3933' is-artificial='yes'/>
+            <parameter type-id='type-id-3928'/>
+            <return type-id='type-id-3927'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE7addressERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3938' is-artificial='yes'/>
-            <parameter type-id='type-id-3935'/>
-            <return type-id='type-id-3934'/>
+            <parameter type-id='type-id-3933' is-artificial='yes'/>
+            <parameter type-id='type-id-3930'/>
+            <return type-id='type-id-3929'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE8allocateEmPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3936' is-artificial='yes'/>
+            <parameter type-id='type-id-3931' is-artificial='yes'/>
             <parameter type-id='type-id-230'/>
             <parameter type-id='type-id-286'/>
-            <return type-id='type-id-3932'/>
+            <return type-id='type-id-3927'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE10deallocateEPS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE10deallocateEPS3_m'>
-            <parameter type-id='type-id-3936' is-artificial='yes'/>
-            <parameter type-id='type-id-3932'/>
+            <parameter type-id='type-id-3931' is-artificial='yes'/>
+            <parameter type-id='type-id-3927'/>
             <parameter type-id='type-id-230'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIN5mongo8executor20RemoteCommandRequestEE8max_sizeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/new_allocator.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3938' is-artificial='yes'/>
+            <parameter type-id='type-id-3933' is-artificial='yes'/>
             <return type-id='type-id-230'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3939' size-in-bits='64' id='type-id-3925'/>
-    <qualified-type-def type-id='type-id-3806' const='yes' id='type-id-3905'/>
-    <pointer-type-def type-id='type-id-3940' size-in-bits='64' id='type-id-3921'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3941' size-in-bits='64' id='type-id-3912'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3942' size-in-bits='64' id='type-id-3922'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3943' size-in-bits='64' id='type-id-3900'/>
-    <pointer-type-def type-id='type-id-3944' size-in-bits='64' id='type-id-3904'/>
-    <qualified-type-def type-id='type-id-3804' const='yes' id='type-id-3907'/>
-    <qualified-type-def type-id='type-id-3850' const='yes' id='type-id-3908'/>
-    <qualified-type-def type-id='type-id-3852' const='yes' id='type-id-3909'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3849' size-in-bits='64' id='type-id-3923'/>
-    <pointer-type-def type-id='type-id-3849' size-in-bits='64' id='type-id-3919'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3915' size-in-bits='64' id='type-id-3920'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3915' size-in-bits='64' id='type-id-3913'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3910' size-in-bits='64' id='type-id-3914'/>
-    <pointer-type-def type-id='type-id-3910' size-in-bits='64' id='type-id-3911'/>
-    <pointer-type-def type-id='type-id-3851' size-in-bits='64' id='type-id-3899'/>
-    <pointer-type-def type-id='type-id-3872' size-in-bits='64' id='type-id-3903'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3934' size-in-bits='64' id='type-id-3920'/>
+    <qualified-type-def type-id='type-id-3801' const='yes' id='type-id-3900'/>
+    <pointer-type-def type-id='type-id-3935' size-in-bits='64' id='type-id-3916'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3936' size-in-bits='64' id='type-id-3907'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3937' size-in-bits='64' id='type-id-3917'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3938' size-in-bits='64' id='type-id-3895'/>
+    <pointer-type-def type-id='type-id-3939' size-in-bits='64' id='type-id-3899'/>
+    <qualified-type-def type-id='type-id-3799' const='yes' id='type-id-3902'/>
+    <qualified-type-def type-id='type-id-3845' const='yes' id='type-id-3903'/>
+    <qualified-type-def type-id='type-id-3847' const='yes' id='type-id-3904'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3844' size-in-bits='64' id='type-id-3918'/>
+    <pointer-type-def type-id='type-id-3844' size-in-bits='64' id='type-id-3914'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3910' size-in-bits='64' id='type-id-3915'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3910' size-in-bits='64' id='type-id-3908'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3905' size-in-bits='64' id='type-id-3909'/>
+    <pointer-type-def type-id='type-id-3905' size-in-bits='64' id='type-id-3906'/>
+    <pointer-type-def type-id='type-id-3846' size-in-bits='64' id='type-id-3894'/>
+    <pointer-type-def type-id='type-id-3867' size-in-bits='64' id='type-id-3898'/>
     <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-3924'>
+      <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-3919'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3945' 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-3917'/>
+          <typedef-decl name='pointer' type-id='type-id-3940' 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-3912'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <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-3924'>
+      <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-3919'>
         <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-3946'>
+          <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-3941'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3947' 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-3916'/>
+              <typedef-decl name='other' type-id='type-id-3942' 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-3911'/>
             </member-type>
           </class-decl>
         </member-type>
@@ -39177,79 +39172,79 @@
     </namespace-decl>
     <namespace-decl name='mongo'>
       <namespace-decl name='repl'>
-        <typedef-decl name='ResponseStatus' type-id='type-id-2639' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3906'/>
+        <typedef-decl name='ResponseStatus' type-id='type-id-2639' filepath='src/mongo/db/repl/replication_executor.h' line='350' column='1' id='type-id-3901'/>
       </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-3948'>
+      <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-3943'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3811' 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-3930'/>
+          <typedef-decl name='__type' type-id='type-id-3806' 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-3925'/>
         </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-3928'>
+      <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-3923'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3808' 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-3929'/>
+          <typedef-decl name='__pointer' type-id='type-id-3803' 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-3924'/>
         </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-3928'>
+      <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-3923'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3807' 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-3927'/>
+          <typedef-decl name='value_type' type-id='type-id-3802' 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-3922'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-3893' size-in-bits='64' id='type-id-3936'/>
-    <qualified-type-def type-id='type-id-3931' const='yes' id='type-id-3939'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3949' size-in-bits='64' id='type-id-3937'/>
-    <pointer-type-def type-id='type-id-3949' size-in-bits='64' id='type-id-3938'/>
-    <qualified-type-def type-id='type-id-3849' const='yes' id='type-id-3940'/>
-    <qualified-type-def type-id='type-id-3915' const='yes' id='type-id-3941'/>
-    <qualified-type-def type-id='type-id-3918' const='yes' id='type-id-3942'/>
-    <qualified-type-def type-id='type-id-3851' const='yes' id='type-id-3943'/>
-    <qualified-type-def type-id='type-id-3872' const='yes' id='type-id-3944'/>
+    <pointer-type-def type-id='type-id-3888' size-in-bits='64' id='type-id-3931'/>
+    <qualified-type-def type-id='type-id-3926' const='yes' id='type-id-3934'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3944' size-in-bits='64' id='type-id-3932'/>
+    <pointer-type-def type-id='type-id-3944' size-in-bits='64' id='type-id-3933'/>
+    <qualified-type-def type-id='type-id-3844' const='yes' id='type-id-3935'/>
+    <qualified-type-def type-id='type-id-3910' const='yes' id='type-id-3936'/>
+    <qualified-type-def type-id='type-id-3913' const='yes' id='type-id-3937'/>
+    <qualified-type-def type-id='type-id-3846' const='yes' id='type-id-3938'/>
+    <qualified-type-def type-id='type-id-3867' const='yes' id='type-id-3939'/>
     <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-3924'>
+      <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-3919'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3950' 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-3931'/>
+          <typedef-decl name='value_type' type-id='type-id-3945' 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-3926'/>
         </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-3951'>
+      <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-3946'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3952' 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-3945'/>
+          <typedef-decl name='pointer' type-id='type-id-3947' 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-3940'/>
         </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-3951'>
+      <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-3946'>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3953' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3947'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3948' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3942'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-3893' const='yes' id='type-id-3949'/>
+    <qualified-type-def type-id='type-id-3888' const='yes' id='type-id-3944'/>
     <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-3954'>
+      <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-3949'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3898' 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-3953'/>
+          <typedef-decl name='__type' 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='65' column='1' id='type-id-3948'/>
         </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-3951'>
+      <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-3946'>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3895' 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-3952'/>
+          <typedef-decl name='__pointer' type-id='type-id-3890' 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-3947'/>
         </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-3951'>
+      <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-3946'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3894' 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-3950'/>
+          <typedef-decl name='value_type' type-id='type-id-3889' 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-3945'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -39282,89 +39277,89 @@
 
 
 
-      <class-decl name='_Bind_helper&lt;false, 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;' 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='1601' column='1' id='type-id-3955'>
+      <class-decl name='_Bind_helper&lt;false, 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;' 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='1601' column='1' id='type-id-3950'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3956'/>
+          <typedef-decl name='type' type-id='type-id-1479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3951'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3892'>
+      <class-decl name='iterator_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/stl_iterator_base_types.h' line='175' column='1' id='type-id-3887'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3794'/>
+          <typedef-decl name='reference' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='181' column='1' id='type-id-3789'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3796'/>
+          <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='180' column='1' id='type-id-3791'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-3798'/>
+          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='179' column='1' id='type-id-3793'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-1019' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3957'/>
+          <typedef-decl name='value_type' type-id='type-id-1019' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='178' column='1' id='type-id-3952'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3891'>
+      <class-decl name='iterator_traits&lt;const 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/stl_iterator_base_types.h' line='186' column='1' id='type-id-3886'>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-3784'/>
+          <typedef-decl name='reference' type-id='type-id-946' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='192' column='1' id='type-id-3779'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-3786'/>
+          <typedef-decl name='pointer' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='191' column='1' id='type-id-3781'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-3788'/>
+          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator_base_types.h' line='190' column='1' id='type-id-3783'/>
         </member-type>
       </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-3928'>
+      <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-3923'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3807' 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-3927'/>
+          <typedef-decl name='value_type' type-id='type-id-3802' 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-3922'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3808' 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-3929'/>
+          <typedef-decl name='__pointer' type-id='type-id-3803' 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-3924'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3929' 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-3888'/>
+          <typedef-decl name='pointer' type-id='type-id-3924' 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-3883'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__size_type' type-id='type-id-3809' 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-3958'/>
+          <typedef-decl name='__size_type' type-id='type-id-3804' 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-3953'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-3958' 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-3959'/>
+          <typedef-decl name='size_type' type-id='type-id-3953' 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-3954'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-3961' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3960'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-3956' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-3955'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-3960' 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-3962'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-3955' 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-3957'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3930' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3890'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3925' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3885'/>
         </member-type>
         <member-function access='private' static='yes'>
           <function-decl name='_S_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE17_S_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-3963'/>
+            <return type-id='type-id-3958'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_const_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE23_S_const_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-3964'/>
+            <return type-id='type-id-3959'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_void_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE22_S_void_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-3965'/>
+            <return type-id='type-id-3960'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_const_void_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE28_S_const_void_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-3961'/>
+            <return type-id='type-id-3956'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_difference_type_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE25_S_difference_type_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-3966'/>
+            <return type-id='type-id-3961'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -39393,220 +39388,220 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8allocateERS4_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8allocateERS4_m'>
-            <parameter type-id='type-id-3967'/>
-            <parameter type-id='type-id-3959'/>
-            <return type-id='type-id-3888'/>
+            <parameter type-id='type-id-3962'/>
+            <parameter type-id='type-id-3954'/>
+            <return type-id='type-id-3883'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE8allocateERS4_mPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3967'/>
-            <parameter type-id='type-id-3959'/>
             <parameter type-id='type-id-3962'/>
-            <return type-id='type-id-3888'/>
+            <parameter type-id='type-id-3954'/>
+            <parameter type-id='type-id-3957'/>
+            <return type-id='type-id-3883'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10deallocateERS4_PS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10deallocateERS4_PS3_m'>
-            <parameter type-id='type-id-3967'/>
-            <parameter type-id='type-id-3888'/>
-            <parameter type-id='type-id-3959'/>
+            <parameter type-id='type-id-3962'/>
+            <parameter type-id='type-id-3883'/>
+            <parameter type-id='type-id-3954'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </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-3813'/>
-            <return type-id='type-id-3959'/>
+            <parameter type-id='type-id-3808'/>
+            <return type-id='type-id-3954'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='select_on_container_copy_construction' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE37select_on_container_copy_constructionERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3813'/>
-            <return type-id='type-id-3737'/>
+            <parameter type-id='type-id-3808'/>
+            <return type-id='type-id-3732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE9constructIS3_JRKS3_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE9constructIS3_JRKS3_EEEDTcl12_S_constructfp_fp0_spclsr3stdE7forwardIT0_Efp1_EEERS4_PT_DpOS9_'>
-            <parameter type-id='type-id-3967'/>
+            <parameter type-id='type-id-3962'/>
             <parameter type-id='type-id-2632'/>
             <parameter type-id='type-id-946'/>
-            <return type-id='type-id-3968'/>
+            <return type-id='type-id-3963'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='410' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE7destroyIS3_EEvRS4_PT_'>
-            <parameter type-id='type-id-3967'/>
+            <parameter type-id='type-id-3962'/>
             <parameter type-id='type-id-2632'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_destroyIS3_EENSt9enable_ifIXsr6__and_INS5_16__destroy_helperIT_E4typeEEE5valueEvE4typeERS4_PS9_'>
-            <parameter type-id='type-id-3967'/>
+            <parameter type-id='type-id-3962'/>
             <parameter type-id='type-id-2632'/>
-            <return type-id='type-id-3969'/>
+            <return type-id='type-id-3964'/>
           </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-3813'/>
+            <parameter type-id='type-id-3808'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-3959'/>
+            <return type-id='type-id-3954'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE12_S_constructIS3_JRKS3_EEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSB_DpOSC_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE12_S_constructIS3_JRKS3_EEENSt9enable_ifIXsr6__and_INS5_18__construct_helperIT_JDpT0_EE4typeEEE5valueEvE4typeERS4_PSB_DpOSC_'>
-            <parameter type-id='type-id-3967'/>
+            <parameter type-id='type-id-3962'/>
             <parameter type-id='type-id-2632'/>
             <parameter type-id='type-id-946'/>
-            <return type-id='type-id-3968'/>
+            <return type-id='type-id-3963'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3806' 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-3970'/>
-      <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-3971'>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' type-id='type-id-3801' 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-3965'/>
+      <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-3966'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2632' 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-3972'/>
+          <typedef-decl name='pointer' type-id='type-id-2632' 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-3967'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3964'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-2633' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3959'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3965'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3960'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3961'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-3956'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-3966'/>
+          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-3961'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='pointer_to' mangled-name='_ZNSt14pointer_traitsIPN5mongo8executor12TaskExecutor14CallbackHandleEE10pointer_toERS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3973'/>
-            <return type-id='type-id-3972'/>
+            <parameter type-id='type-id-3968'/>
+            <return type-id='type-id-3967'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;mongo::executor::TaskExecutor::CallbackHandle, 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='105' column='1' id='type-id-3974'>
+      <class-decl name='__ptrtr_not_void&lt;mongo::executor::TaskExecutor::CallbackHandle, 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='105' column='1' id='type-id-3969'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1019' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-3975'/>
+          <typedef-decl name='__type' type-id='type-id-1019' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-3970'/>
         </member-type>
       </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-3948'>
+      <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-3943'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3811' 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-3930'/>
+          <typedef-decl name='__type' type-id='type-id-3806' 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-3925'/>
         </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-2329' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3968'/>
-      <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' type-id='type-id-2329' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3969'/>
-      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3758'/>
-      <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-3744'/>
-      <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-3746'/>
+      <typedef-decl name='_Require&lt;__has_construct&lt;mongo::executor::TaskExecutor::CallbackHandle, const mongo::executor::TaskExecutor::CallbackHandle &amp;&gt; &gt;' type-id='type-id-2329' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3963'/>
+      <typedef-decl name='_Require&lt;__has_destroy&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt;' type-id='type-id-2329' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1957' column='1' id='type-id-3964'/>
+      <class-decl name='initializer_list&lt;mongo::executor::TaskExecutor::CallbackHandle&gt;' visibility='default' is-declaration-only='yes' id='type-id-3753'/>
+      <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-3739'/>
+      <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-3741'/>
       <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-3976' 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-3971' 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-930' name='__args' 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-3616' name='__args' 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-3621' name='__args' 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-3626' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-3956'/>
+        <return type-id='type-id-3951'/>
       </function-decl>
-      <class-decl name='_Bind_helper&lt;false, void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &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='1601' column='1' id='type-id-3977'>
+      <class-decl name='_Bind_helper&lt;false, void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &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='1601' column='1' id='type-id-3972'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1241' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3978'/>
+          <typedef-decl name='type' type-id='type-id-1241' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-3973'/>
         </member-type>
       </class-decl>
       <function-decl name='bind&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *), const std::_Placeholder&lt;1&gt; &amp;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt4bindIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEJRKSt12_PlaceholderILi1EES8_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESG_JDpT0_EE4typeEOSG_DpOSH_' 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='_ZSt4bindIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEJRKSt12_PlaceholderILi1EES8_EENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESG_JDpT0_EE4typeEOSG_DpOSH_'>
-        <parameter type-id='type-id-3620' 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-3615' 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-930' name='__args' 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-3621' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-3978'/>
+        <parameter type-id='type-id-3616' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
+        <return type-id='type-id-3973'/>
       </function-decl>
-      <class-decl name='_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;' size-in-bits='192' 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-3979'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3980'/>
+      <class-decl name='_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;' size-in-bits='192' 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-3974'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3975'/>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_f' type-id='type-id-3981' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
+          <var-decl name='_M_f' type-id='type-id-3976' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1255' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_bound_args' type-id='type-id-3982' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
+          <var-decl name='_M_bound_args' type-id='type-id-3977' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Bind' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3983' is-artificial='yes'/>
-            <parameter type-id='type-id-3984'/>
+            <parameter type-id='type-id-3978' is-artificial='yes'/>
+            <parameter type-id='type-id-3979'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2EOSG_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2EOSG_'>
-            <parameter type-id='type-id-3983' is-artificial='yes'/>
-            <parameter type-id='type-id-3985'/>
+            <parameter type-id='type-id-3978' is-artificial='yes'/>
+            <parameter type-id='type-id-3980'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEclIJRS6_EvEET0_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEclIJRS6_EvEET0_DpOT_'>
-            <parameter type-id='type-id-3983' is-artificial='yes'/>
+            <parameter type-id='type-id-3978' is-artificial='yes'/>
             <parameter type-id='type-id-932'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <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-3641'/>
+            <parameter type-id='type-id-3978' is-artificial='yes'/>
+            <parameter type-id='type-id-3636'/>
             <parameter type-id='type-id-1073'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Bind&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2IJRSC_RKSE_EEEOSB_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEPS3_St12_PlaceholderILi1EEEEC2IJRSC_RKSE_EEEOSB_DpOT_'>
-            <parameter type-id='type-id-3983' is-artificial='yes'/>
-            <parameter type-id='type-id-3986'/>
+            <parameter type-id='type-id-3978' is-artificial='yes'/>
+            <parameter type-id='type-id-3981'/>
             <parameter type-id='type-id-956'/>
             <parameter type-id='type-id-930'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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-3980'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3987'/>
+      <class-decl name='_Weak_result_type&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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-3975'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3982'/>
       </class-decl>
-      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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='86' column='1' id='type-id-3987'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3988'/>
+      <class-decl name='_Weak_result_type_impl&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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='86' column='1' id='type-id-3982'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3983'/>
       </class-decl>
-      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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='78' column='1' id='type-id-3988'/>
-      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-3981'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3989'/>
+      <class-decl name='_Maybe_get_result_type&lt;true, std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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='78' column='1' id='type-id-3983'/>
+      <class-decl name='_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' size-in-bits='128' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='509' column='1' id='type-id-3976'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3984'/>
         <member-function access='public'>
           <function-decl name='_Mem_fn' mangled-name='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEC2ES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEC2ES9_'>
-            <parameter type-id='type-id-3990' is-artificial='yes'/>
+            <parameter type-id='type-id-3985' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator()&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;, void&gt;' mangled-name='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEclIJRS5_EvEEvPS2_DpOT_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEclIJRS5_EvEEvPS2_DpOT_'>
-            <parameter type-id='type-id-3991' is-artificial='yes'/>
+            <parameter type-id='type-id-3986' is-artificial='yes'/>
             <parameter type-id='type-id-940'/>
             <parameter type-id='type-id-932'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &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/functional' line='504' column='1' id='type-id-3989'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3992'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &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/functional' line='504' column='1' id='type-id-3984'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3987'/>
       </class-decl>
-      <class-decl name='binary_function&lt;mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &amp;, void&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/stl_function.h' line='118' column='1' id='type-id-3992'/>
-      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &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-3982'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3993'/>
+      <class-decl name='binary_function&lt;mongo::repl::ReplicationExecutor *, const mongo::executor::TaskExecutor::CallbackHandle &amp;, void&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/stl_function.h' line='118' column='1' id='type-id-3987'/>
+      <class-decl name='tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &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-3977'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3988'/>
         <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-3994' is-artificial='yes'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-3994' is-artificial='yes'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
             <parameter type-id='type-id-945'/>
             <parameter type-id='type-id-930'/>
             <return type-id='type-id-11'/>
@@ -39614,87 +39609,87 @@
         </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-3994' is-artificial='yes'/>
-            <parameter type-id='type-id-3995'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
+            <parameter type-id='type-id-3990'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_' 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='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_'>
-            <parameter type-id='type-id-3994' is-artificial='yes'/>
-            <parameter type-id='type-id-3996'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
+            <parameter type-id='type-id-3991'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='618' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3994' is-artificial='yes'/>
-            <parameter type-id='type-id-3995'/>
-            <return type-id='type-id-3997'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
+            <parameter type-id='type-id-3990'/>
+            <return type-id='type-id-3992'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3994' is-artificial='yes'/>
-            <parameter type-id='type-id-3996'/>
-            <return type-id='type-id-3997'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
+            <parameter type-id='type-id-3991'/>
+            <return type-id='type-id-3992'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='swap' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE4swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='667' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3994' is-artificial='yes'/>
-            <parameter type-id='type-id-3997'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
+            <parameter type-id='type-id-3992'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='tuple&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;, void&gt;' mangled-name='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_RKS5_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='_ZNSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_RKS5_vEEOT_OT0_'>
-            <parameter type-id='type-id-3994' is-artificial='yes'/>
+            <parameter type-id='type-id-3989' is-artificial='yes'/>
             <parameter type-id='type-id-956'/>
             <parameter type-id='type-id-930'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&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-3993'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3998'/>
+      <class-decl name='_Tuple_impl&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&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-3988'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3993'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-953'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-3998' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3999'/>
+          <typedef-decl name='_Inherited' type-id='type-id-3993' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-3994'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_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_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_headERS6_'>
-            <parameter type-id='type-id-4000'/>
+            <parameter type-id='type-id-3995'/>
             <return type-id='type-id-956'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_headERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4001'/>
+            <parameter type-id='type-id-3996'/>
             <return type-id='type-id-945'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_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_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_tailERS6_'>
-            <parameter type-id='type-id-4000'/>
-            <return type-id='type-id-4002'/>
+            <parameter type-id='type-id-3995'/>
+            <return type-id='type-id-3997'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_tailERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4001'/>
-            <return type-id='type-id-4003'/>
+            <parameter type-id='type-id-3996'/>
+            <return type-id='type-id-3998'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4004' is-artificial='yes'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </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-4004' is-artificial='yes'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
             <parameter type-id='type-id-945'/>
             <parameter type-id='type-id-930'/>
             <return type-id='type-id-11'/>
@@ -39702,210 +39697,210 @@
         </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-4004' is-artificial='yes'/>
-            <parameter type-id='type-id-4001'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
+            <parameter type-id='type-id-3996'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_' 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_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2EOS6_'>
-            <parameter type-id='type-id-4004' is-artificial='yes'/>
-            <parameter type-id='type-id-4005'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
+            <parameter type-id='type-id-4000'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEaSERKS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4004' is-artificial='yes'/>
-            <parameter type-id='type-id-4001'/>
-            <return type-id='type-id-4000'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
+            <parameter type-id='type-id-3996'/>
+            <return type-id='type-id-3995'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEaSEOS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4004' is-artificial='yes'/>
-            <parameter type-id='type-id-4005'/>
-            <return type-id='type-id-4000'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
+            <parameter type-id='type-id-4000'/>
+            <return type-id='type-id-3995'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEE7_M_swapERS6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4004' is-artificial='yes'/>
-            <parameter type-id='type-id-4000'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
+            <parameter type-id='type-id-3995'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl&lt;mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;, void&gt;' mangled-name='_ZNSt11_Tuple_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_JRKS5_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_implILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEC2IRS3_JRKS5_EvEEOT_DpOT0_'>
-            <parameter type-id='type-id-4004' is-artificial='yes'/>
+            <parameter type-id='type-id-3999' is-artificial='yes'/>
             <parameter type-id='type-id-956'/>
             <parameter type-id='type-id-930'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&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='231' column='1' id='type-id-3998'>
+      <class-decl name='_Tuple_impl&lt;1, std::_Placeholder&lt;1&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='231' column='1' id='type-id-3993'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-409'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-963'/>
         <member-type access='public'>
-          <typedef-decl name='_Inherited' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-4006'/>
+          <typedef-decl name='_Inherited' type-id='type-id-409' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='237' column='1' id='type-id-4001'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_headERS2_' 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_implILm1EJSt12_PlaceholderILi1EEEE7_M_headERS2_'>
-            <parameter type-id='type-id-4007'/>
+            <parameter type-id='type-id-4002'/>
             <return type-id='type-id-966'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_head' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_headERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4008'/>
+            <parameter type-id='type-id-4003'/>
             <return type-id='type-id-930'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_tailERS2_' 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_implILm1EJSt12_PlaceholderILi1EEEE7_M_tailERS2_'>
-            <parameter type-id='type-id-4007'/>
-            <return type-id='type-id-4009'/>
+            <parameter type-id='type-id-4002'/>
+            <return type-id='type-id-4004'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_M_tail' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_tailERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4008'/>
-            <return type-id='type-id-4010'/>
+            <parameter type-id='type-id-4003'/>
+            <return type-id='type-id-4005'/>
           </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='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4011' is-artificial='yes'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEC2ERKS1_' 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_implILm1EJSt12_PlaceholderILi1EEEEC2ERKS1_'>
-            <parameter type-id='type-id-4011' is-artificial='yes'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
             <parameter type-id='type-id-930'/>
             <return type-id='type-id-11'/>
           </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-4011' is-artificial='yes'/>
-            <parameter type-id='type-id-4008'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
+            <parameter type-id='type-id-4003'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Tuple_impl' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEC2EOS2_' 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_implILm1EJSt12_PlaceholderILi1EEEEC2EOS2_'>
-            <parameter type-id='type-id-4011' is-artificial='yes'/>
-            <parameter type-id='type-id-4012'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
+            <parameter type-id='type-id-4007'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEaSERKS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4011' is-artificial='yes'/>
-            <parameter type-id='type-id-4008'/>
-            <return type-id='type-id-4007'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
+            <parameter type-id='type-id-4003'/>
+            <return type-id='type-id-4002'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator=' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEaSEOS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4011' is-artificial='yes'/>
-            <parameter type-id='type-id-4012'/>
-            <return type-id='type-id-4007'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
+            <parameter type-id='type-id-4007'/>
+            <return type-id='type-id-4002'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZNSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEE7_M_swapERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4011' is-artificial='yes'/>
-            <parameter type-id='type-id-4007'/>
+            <parameter type-id='type-id-4006' is-artificial='yes'/>
+            <parameter type-id='type-id-4002'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-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-3740' 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-3740' 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-3979' 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-3979'/>
+        <parameter type-id='type-id-3735' 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-3735' 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-3974' 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-3974'/>
       </function-decl>
-      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&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/functional' line='1601' column='1' id='type-id-4013'>
+      <class-decl name='_Bind_helper&lt;false, void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&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/functional' line='1601' column='1' id='type-id-4008'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3979' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-4014'/>
+          <typedef-decl name='type' type-id='type-id-3974' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1606' column='1' id='type-id-4009'/>
         </member-type>
       </class-decl>
       <function-decl name='bind&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;), mongo::repl::ReplicationExecutor *&amp;, const std::_Placeholder&lt;1&gt; &amp;&gt;' mangled-name='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEJRPS2_RKSt12_PlaceholderILi1EEEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESH_JDpT0_EE4typeEOSH_DpOSI_' 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='_ZSt4bindIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEJRPS2_RKSt12_PlaceholderILi1EEEENSt12_Bind_helperIXsr15__is_socketlikeIT_EE5valueESH_JDpT0_EE4typeEOSH_DpOSI_'>
         <parameter type-id='type-id-956' name='__args' 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-930' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1623' column='1'/>
-        <return type-id='type-id-4014'/>
+        <return type-id='type-id-4009'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;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; &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-4015'>
+      <class-decl name='remove_reference&lt;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; &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-4010'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3979' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4016'/>
+          <typedef-decl name='type' type-id='type-id-3974' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4011'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;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; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS2_8executor12TaskExecutor14CallbackHandleEEEPS4_St12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSK_' 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='_ZSt4moveIRSt5_BindIFSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS2_8executor12TaskExecutor14CallbackHandleEEEPS4_St12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSK_'>
-        <parameter type-id='type-id-4017' 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-4018'/>
+        <parameter type-id='type-id-4012' 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-4013'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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-4019'>
+      <class-decl name='remove_reference&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&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-4014'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3981' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4020'/>
+          <typedef-decl name='type' type-id='type-id-3976' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4015'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::_Mem_fn&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEEONSt16remove_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='_ZSt4moveIRSt7_Mem_fnIMN5mongo4repl19ReplicationExecutorEFvRKNS1_8executor12TaskExecutor14CallbackHandleEEEEONSt16remove_referenceIT_E4typeEOSE_'>
-        <parameter type-id='type-id-4021' 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-4022'/>
+        <parameter type-id='type-id-4016' 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-4017'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&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-4023'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&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-4018'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3982' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4024'/>
+          <typedef-decl name='type' type-id='type-id-3977' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4019'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::tuple&lt;mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSA_' 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='_ZSt4moveIRSt5tupleIJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-3997' 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-4025'/>
+        <parameter type-id='type-id-3992' 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-4020'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&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-4026'>
+      <class-decl name='remove_reference&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&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-4021'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3998' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4027'/>
+          <typedef-decl name='type' type-id='type-id-3993' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4022'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::_Tuple_impl&lt;1, std::_Placeholder&lt;1&gt; &gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt11_Tuple_implILm1EJSt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOS6_' 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_implILm1EJSt12_PlaceholderILi1EEEEEONSt16remove_referenceIT_E4typeEOS6_'>
-        <parameter type-id='type-id-4007' 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-4028'/>
+        <parameter type-id='type-id-4002' 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-4023'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEESt5tupleIJDpOT_EES8_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRN5mongo8executor12TaskExecutor14CallbackHandleEEESt5tupleIJDpOT_EES8_'>
         <parameter type-id='type-id-932' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-3632'/>
+        <return type-id='type-id-3627'/>
       </function-decl>
       <function-decl name='get&lt;0, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__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='_ZSt3getILm0EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3997' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <parameter type-id='type-id-3992' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-1604'/>
       </function-decl>
       <function-decl name='get&lt;1, mongo::repl::ReplicationExecutor *, std::_Placeholder&lt;1&gt; &gt;' mangled-name='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__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='_ZSt3getILm1EJPN5mongo4repl19ReplicationExecutorESt12_PlaceholderILi1EEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3997' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <parameter type-id='type-id-3992' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-1606'/>
       </function-decl>
       <function-decl name='__get_helper&lt;1, std::_Placeholder&lt;1&gt;&gt;' mangled-name='_ZSt12__get_helperILm1ESt12_PlaceholderILi1EEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_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_helperILm1ESt12_PlaceholderILi1EEJEENSt9__add_refIT0_E4typeERSt11_Tuple_implIXT_EJS3_DpT1_EE'>
-        <parameter type-id='type-id-4007' 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-4002' 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-1606'/>
       </function-decl>
-      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle &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-4029'>
+      <class-decl name='__add_ref&lt;mongo::executor::TaskExecutor::CallbackHandle &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-4024'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-4030'/>
+          <typedef-decl name='type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-4025'/>
         </member-type>
       </class-decl>
       <function-decl name='get&lt;0, mongo::executor::TaskExecutor::CallbackHandle &amp;&gt;' mangled-name='_ZSt3getILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSA_' 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='_ZSt3getILm0EJRN5mongo8executor12TaskExecutor14CallbackHandleEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSA_'>
         <parameter type-id='type-id-2223' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-4030'/>
+        <return type-id='type-id-4025'/>
       </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-3676' 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-4030'/>
+        <parameter type-id='type-id-3671' 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-4025'/>
       </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'>
-        <parameter type-id='type-id-4000' 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-3995' 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-1604'/>
       </function-decl>
       <function-decl name='forward&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &amp;)&gt;' mangled-name='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEOT_RNSt16remove_referenceISA_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='_ZSt7forwardIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEEOT_RNSt16remove_referenceISA_E4typeE'>
@@ -39915,13 +39910,13 @@
         <parameter type-id='type-id-2632' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='295' column='1'/>
         <parameter type-id='type-id-2632' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='296' column='1'/>
         <parameter type-id='type-id-2632' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='297' column='1'/>
-        <parameter type-id='type-id-3967' name='__alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='298' column='1'/>
+        <parameter type-id='type-id-3962' name='__alloc' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='298' column='1'/>
         <return type-id='type-id-2632'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleES3_EvT_S5_RSaIT0_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleES3_EvT_S5_RSaIT0_E'>
         <parameter type-id='type-id-2632' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
         <parameter type-id='type-id-2632' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-3967' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
+        <parameter type-id='type-id-3962' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
         <return type-id='type-id-11'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEvT_S5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEvT_S5_'>
@@ -39937,138 +39932,138 @@
         <parameter type-id='type-id-932' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
         <return type-id='type-id-2632'/>
       </function-decl>
-      <class-decl name='move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&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='947' column='1' id='type-id-4031'>
+      <class-decl name='move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&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='947' column='1' id='type-id-4026'>
         <member-type access='private'>
-          <typedef-decl name='iterator_type' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-4032'/>
+          <typedef-decl name='iterator_type' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='955' column='1' id='type-id-4027'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-3957' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='957' column='1' id='type-id-4033'/>
+          <typedef-decl name='value_type' type-id='type-id-3952' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='957' column='1' id='type-id-4028'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reference' type-id='type-id-4035' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-4034'/>
+          <typedef-decl name='reference' type-id='type-id-4030' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='961' column='1' id='type-id-4029'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='960' column='1' id='type-id-4036'/>
+          <typedef-decl name='pointer' type-id='type-id-2632' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='960' column='1' id='type-id-4031'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='difference_type' type-id='type-id-3798' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='958' column='1' id='type-id-4037'/>
+          <typedef-decl name='difference_type' type-id='type-id-3793' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='958' column='1' id='type-id-4032'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_current' type-id='type-id-2632' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='950' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='move_iterator' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='963' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='move_iterator' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEC2ES4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='967' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEC2ES4_'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
-            <parameter type-id='type-id-4032'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
+            <parameter type-id='type-id-4027'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='base' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEE4baseEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEE4baseEv'>
-            <parameter type-id='type-id-4039' is-artificial='yes'/>
-            <return type-id='type-id-4032'/>
+            <parameter type-id='type-id-4034' is-artificial='yes'/>
+            <return type-id='type-id-4027'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator*' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEdeEv'>
-            <parameter type-id='type-id-4039' is-artificial='yes'/>
-            <return type-id='type-id-4034'/>
+            <parameter type-id='type-id-4034' is-artificial='yes'/>
+            <return type-id='type-id-4029'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEptEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='983' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4039' is-artificial='yes'/>
-            <return type-id='type-id-4036'/>
+            <parameter type-id='type-id-4034' is-artificial='yes'/>
+            <return type-id='type-id-4031'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEppEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='987' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEppEv'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
-            <return type-id='type-id-4040'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
+            <return type-id='type-id-4035'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEppEi' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='994' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-4031'/>
+            <return type-id='type-id-4026'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEmmEv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1002' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
-            <return type-id='type-id-4040'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
+            <return type-id='type-id-4035'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEmmEi' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1009' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-4031'/>
+            <return type-id='type-id-4026'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEplEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1017' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4039' is-artificial='yes'/>
-            <parameter type-id='type-id-4037'/>
-            <return type-id='type-id-4031'/>
+            <parameter type-id='type-id-4034' is-artificial='yes'/>
+            <parameter type-id='type-id-4032'/>
+            <return type-id='type-id-4026'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator+=' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEpLEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1021' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
-            <parameter type-id='type-id-4037'/>
-            <return type-id='type-id-4040'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
+            <parameter type-id='type-id-4032'/>
+            <return type-id='type-id-4035'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEmiEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1028' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4039' is-artificial='yes'/>
-            <parameter type-id='type-id-4037'/>
-            <return type-id='type-id-4031'/>
+            <parameter type-id='type-id-4034' is-artificial='yes'/>
+            <parameter type-id='type-id-4032'/>
+            <return type-id='type-id-4026'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator-=' mangled-name='_ZNSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEmIEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1032' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4038' is-artificial='yes'/>
-            <parameter type-id='type-id-4037'/>
-            <return type-id='type-id-4040'/>
+            <parameter type-id='type-id-4033' is-artificial='yes'/>
+            <parameter type-id='type-id-4032'/>
+            <return type-id='type-id-4035'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNKSt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEEixEl' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1039' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4039' is-artificial='yes'/>
-            <parameter type-id='type-id-4037'/>
-            <return type-id='type-id-4034'/>
+            <parameter type-id='type-id-4034' is-artificial='yes'/>
+            <parameter type-id='type-id-4032'/>
+            <return type-id='type-id-4029'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='__uninitialized_copy_a&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt22__uninitialized_copy_aISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_S4_ET0_T_S8_S7_RSaIT1_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt22__uninitialized_copy_aISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_S4_ET0_T_S8_S7_RSaIT1_E'>
-        <parameter type-id='type-id-4031' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
-        <parameter type-id='type-id-4031' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-4026' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
+        <parameter type-id='type-id-4026' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='277' column='1'/>
         <parameter type-id='type-id-2632' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
-        <parameter type-id='type-id-3967' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
+        <parameter type-id='type-id-3962' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='278' column='1'/>
         <return type-id='type-id-2632'/>
       </function-decl>
       <function-decl name='__make_move_if_noexcept_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt; &gt;' mangled-name='_ZSt32__make_move_if_noexcept_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt13move_iteratorIS4_EET0_T_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt32__make_move_if_noexcept_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleESt13move_iteratorIS4_EET0_T_'>
         <parameter type-id='type-id-2632' name='__i' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1149' column='1'/>
-        <return type-id='type-id-4031'/>
+        <return type-id='type-id-4026'/>
       </function-decl>
       <function-decl name='uninitialized_copy&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSt18uninitialized_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_ET0_T_S8_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt18uninitialized_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES5_ET0_T_S8_S7_'>
-        <parameter type-id='type-id-4031' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
-        <parameter type-id='type-id-4031' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-4026' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
+        <parameter type-id='type-id-4026' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='107' column='1'/>
         <parameter type-id='type-id-2632' name='__result' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='108' column='1'/>
         <return type-id='type-id-2632'/>
       </function-decl>
       <function-decl name='operator!=&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZStneIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStneIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_'>
-        <parameter type-id='type-id-4041' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
-        <parameter type-id='type-id-4041' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
+        <parameter type-id='type-id-4036' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
+        <parameter type-id='type-id-4036' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
         <return type-id='type-id-19'/>
       </function-decl>
       <function-decl name='_Construct&lt;mongo::executor::TaskExecutor::CallbackHandle, mongo::executor::TaskExecutor::CallbackHandle&gt;' mangled-name='_ZSt10_ConstructIN5mongo8executor12TaskExecutor14CallbackHandleEJS3_EEvPT_DpOT0_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt10_ConstructIN5mongo8executor12TaskExecutor14CallbackHandleEJS3_EEvPT_DpOT0_'>
@@ -40077,8 +40072,8 @@
         <return type-id='type-id-11'/>
       </function-decl>
       <function-decl name='operator==&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZSteqIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSteqIPN5mongo8executor12TaskExecutor14CallbackHandleEEbRKSt13move_iteratorIT_ES9_'>
-        <parameter type-id='type-id-4041' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
-        <parameter type-id='type-id-4041' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
+        <parameter type-id='type-id-4036' name='__x' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1066' column='1'/>
+        <parameter type-id='type-id-4036' name='__y' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='1067' column='1'/>
         <return type-id='type-id-19'/>
       </function-decl>
       <function-decl name='max&lt;unsigned long&gt;' mangled-name='_ZSt3maxImERKT_S2_S2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt3maxImERKT_S2_S2_'>
@@ -40086,11 +40081,11 @@
         <parameter type-id='type-id-1246' name='__b' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_algobase.h' line='356' column='1'/>
         <return type-id='type-id-1246'/>
       </function-decl>
-      <typedef-decl name='__allocator_base&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3893' 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-4042'/>
+      <typedef-decl name='__allocator_base&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3888' 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-4037'/>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest *, mongo::executor::RemoteCommandRequest&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestES2_EvT_S4_RSaIT0_E' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestES2_EvT_S4_RSaIT0_E'>
         <parameter type-id='type-id-2646' name='__first' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
         <parameter type-id='type-id-2646' name='__last' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='148' column='1'/>
-        <parameter type-id='type-id-4043' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
+        <parameter type-id='type-id-4038' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='149' column='1'/>
         <return type-id='type-id-11'/>
       </function-decl>
       <function-decl name='_Destroy&lt;mongo::executor::RemoteCommandRequest *&gt;' mangled-name='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestEEvT_S4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt8_DestroyIPN5mongo8executor20RemoteCommandRequestEEvT_S4_'>
@@ -40106,261 +40101,261 @@
         <parameter type-id='type-id-1186' name='__r' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/move.h' line='47' column='1'/>
         <return type-id='type-id-2646'/>
       </function-decl>
-      <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-4044'>
+      <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-4039'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1241' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4045'/>
+          <typedef-decl name='type' type-id='type-id-1241' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4040'/>
         </member-type>
       </class-decl>
       <function-decl name='move&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;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS1_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES9_EEEONSt16remove_referenceIT_E4typeEOSI_' 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='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS1_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EES9_EEEONSt16remove_referenceIT_E4typeEOSI_'>
-        <parameter type-id='type-id-4046' 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-4047'/>
+        <parameter type-id='type-id-4041' 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-4042'/>
       </function-decl>
       <function-decl name='forward_as_tuple&lt;const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;&gt;' mangled-name='_ZSt16forward_as_tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEESt5tupleIJDpOT_EES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16forward_as_tupleIJRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEEESt5tupleIJDpOT_EES9_'>
         <parameter type-id='type-id-1240' name='__args' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='904' column='1'/>
-        <return type-id='type-id-3631'/>
+        <return type-id='type-id-3626'/>
       </function-decl>
       <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__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='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3653' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <parameter type-id='type-id-3648' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-1606'/>
       </function-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-4048'>
+      <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-4043'>
         <member-type access='public'>
-          <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-4049'/>
+          <typedef-decl name='type' type-id='type-id-3717' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4044'/>
         </member-type>
       </class-decl>
       <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__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='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSB_'>
-        <parameter type-id='type-id-3653' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-4049'/>
+        <parameter type-id='type-id-3648' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-4044'/>
       </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-3729' 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-4049'/>
+        <parameter type-id='type-id-3724' 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-4044'/>
       </function-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-4050'>
+      <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-4045'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3654' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4051'/>
+          <typedef-decl name='type' type-id='type-id-3649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4046'/>
         </member-type>
       </class-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-4052' 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-3722'/>
+        <parameter type-id='type-id-4047' 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-3717'/>
       </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-3692' 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-3687' 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-1606'/>
       </function-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-4053'>
+      <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-4048'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1240' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-4054'/>
+          <typedef-decl name='type' type-id='type-id-1240' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='67' column='1' id='type-id-4049'/>
         </member-type>
       </class-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_'>
         <parameter type-id='type-id-2242' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-4054'/>
+        <return type-id='type-id-4049'/>
       </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-3668' 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-4054'/>
+        <parameter type-id='type-id-3663' 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-4049'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(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='1504' column='1' id='type-id-4055'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(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='1504' column='1' id='type-id-4050'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3617' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4056'/>
+          <typedef-decl name='type' type-id='type-id-3612' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4051'/>
         </member-type>
       </class-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_'>
-        <parameter type-id='type-id-4057' 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-4058'/>
+        <parameter type-id='type-id-4052' 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-4053'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, 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-4059'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, 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-4054'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3618' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4060'/>
+          <typedef-decl name='type' type-id='type-id-3613' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4055'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOSA_' 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='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEEEEONSt16remove_referenceIT_E4typeEOSA_'>
-        <parameter type-id='type-id-3653' 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-4061'/>
+        <parameter type-id='type-id-3648' 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-4056'/>
       </function-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-4062'>
+      <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-4057'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3690' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4063'/>
+          <typedef-decl name='type' type-id='type-id-3685' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4058'/>
         </member-type>
       </class-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-3729' 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-4064'/>
+        <parameter type-id='type-id-3724' 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-4059'/>
       </function-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-4065'>
+      <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-4060'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3654' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4066'/>
+          <typedef-decl name='type' type-id='type-id-3649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4061'/>
         </member-type>
       </class-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'>
-        <parameter type-id='type-id-4067' 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-3621'/>
+        <parameter type-id='type-id-4062' 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-3616'/>
       </function-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-4068'>
+      <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-4063'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3617' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4069'/>
+          <typedef-decl name='type' type-id='type-id-3612' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4064'/>
         </member-type>
       </class-decl>
       <function-decl name='forward&lt;void (*)(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt;' mangled-name='_ZSt7forwardIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEOT_RNSt16remove_referenceISB_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='_ZSt7forwardIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEEOT_RNSt16remove_referenceISB_E4typeE'>
-        <parameter type-id='type-id-4070' 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-3620'/>
+        <parameter type-id='type-id-4065' 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-3615'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, 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-4071'>
+      <class-decl name='remove_reference&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, 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-4066'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4072'/>
+          <typedef-decl name='type' type-id='type-id-1479' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4067'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS1_4repl19ScatterGatherRunnerEPNS1_10StatusWithINS3_11EventHandleEEEESt12_PlaceholderILi1EES9_SD_EEEONSt16remove_referenceIT_E4typeEOSM_' 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='_ZSt4moveIRSt5_BindIFPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS1_4repl19ScatterGatherRunnerEPNS1_10StatusWithINS3_11EventHandleEEEESt12_PlaceholderILi1EES9_SD_EEEONSt16remove_referenceIT_E4typeEOSM_'>
-        <parameter type-id='type-id-4073' 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-4074'/>
+        <parameter type-id='type-id-4068' 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-4069'/>
       </function-decl>
       <function-decl name='get&lt;0, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' 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='_ZSt3getILm0EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-3648' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <parameter type-id='type-id-3643' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
         <return type-id='type-id-1606'/>
       </function-decl>
       <function-decl name='get&lt;1, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' 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='_ZSt3getILm1EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-3648' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-4049'/>
+        <parameter type-id='type-id-3643' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-4044'/>
       </function-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-4075'>
+      <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-4070'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3777' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4076'/>
+          <typedef-decl name='type' type-id='type-id-3772' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='63' column='1' id='type-id-4071'/>
         </member-type>
       </class-decl>
       <function-decl name='get&lt;2, std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt;' mangled-name='_ZSt3getILm2EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_' 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='_ZSt3getILm2EJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS2_10StatusWithINS2_8executor12TaskExecutor11EventHandleEEEEENSt9__add_refINSt13tuple_elementIXT_ESt5tupleIJDpT0_EEE4typeEE4typeERSH_'>
-        <parameter type-id='type-id-3648' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
-        <return type-id='type-id-4076'/>
+        <parameter type-id='type-id-3643' name='__t' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/tuple' line='758' column='1'/>
+        <return type-id='type-id-4071'/>
       </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-3776' 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-4076'/>
+        <parameter type-id='type-id-3771' 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-4071'/>
       </function-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-4077'>
+      <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-4072'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2784' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4078'/>
+          <typedef-decl name='type' type-id='type-id-2784' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4073'/>
         </member-type>
       </class-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-4079' 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-3777'/>
+        <parameter type-id='type-id-4074' 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-3772'/>
       </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-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-4049'/>
+        <parameter type-id='type-id-3716' 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-4044'/>
       </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-3684' 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-3679' 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-1606'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;void (*&amp;)(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/type_traits' line='1504' column='1' id='type-id-4080'>
+      <class-decl name='remove_reference&lt;void (*&amp;)(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/type_traits' line='1504' column='1' id='type-id-4075'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3623' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4081'/>
+          <typedef-decl name='type' type-id='type-id-3618' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4076'/>
         </member-type>
       </class-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_'>
-        <parameter type-id='type-id-4082' 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-4083'/>
+        <parameter type-id='type-id-4077' 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-4078'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, 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-4084'>
+      <class-decl name='remove_reference&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, 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-4079'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3624' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4085'/>
+          <typedef-decl name='type' type-id='type-id-3619' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4080'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::tuple&lt;std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *&gt; &amp;&gt;' mangled-name='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS3_10StatusWithINS3_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSG_' 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='_ZSt4moveIRSt5tupleIJSt12_PlaceholderILi1EEPN5mongo4repl19ScatterGatherRunnerEPNS3_10StatusWithINS3_8executor12TaskExecutor11EventHandleEEEEEEONSt16remove_referenceIT_E4typeEOSG_'>
-        <parameter type-id='type-id-3648' 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-4086'/>
+        <parameter type-id='type-id-3643' 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-4081'/>
       </function-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-4087'>
+      <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-4082'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3682' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4088'/>
+          <typedef-decl name='type' type-id='type-id-3677' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4083'/>
         </member-type>
       </class-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-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-4089'/>
+        <parameter type-id='type-id-3716' 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-4084'/>
       </function-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-4090'>
+      <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-4085'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3718' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4091'/>
+          <typedef-decl name='type' type-id='type-id-3713' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4086'/>
         </member-type>
       </class-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-3776' 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-4092'/>
+        <parameter type-id='type-id-3771' 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-4087'/>
       </function-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-4093'>
+      <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-4088'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2784' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4094'/>
+          <typedef-decl name='type' type-id='type-id-2784' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1501' column='1' id='type-id-4089'/>
         </member-type>
       </class-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'>
-        <parameter type-id='type-id-4095' 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-3626'/>
+        <parameter type-id='type-id-4090' 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-3621'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;void (&amp;)(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/type_traits' line='1504' column='1' id='type-id-4096'>
+      <class-decl name='remove_reference&lt;void (&amp;)(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/type_traits' line='1504' column='1' id='type-id-4091'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3657' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4097'/>
+          <typedef-decl name='type' type-id='type-id-3652' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1505' column='1' id='type-id-4092'/>
         </member-type>
       </class-decl>
       <function-decl name='forward&lt;void (&amp;)(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt;' mangled-name='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_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='_ZSt7forwardIRFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEEOT_RNSt16remove_referenceISF_E4typeE'>
-        <parameter type-id='type-id-4098' 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-3976'/>
+        <parameter type-id='type-id-4093' 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-3971'/>
       </function-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-3951'>
+      <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-3946'>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3894' 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-3950'/>
+          <typedef-decl name='value_type' type-id='type-id-3889' 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-3945'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__pointer' type-id='type-id-3895' 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-3952'/>
+          <typedef-decl name='__pointer' type-id='type-id-3890' 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-3947'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3952' 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-3945'/>
+          <typedef-decl name='pointer' type-id='type-id-3947' 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-3940'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__size_type' type-id='type-id-3896' 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-4099'/>
+          <typedef-decl name='__size_type' type-id='type-id-3891' 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-4094'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-4099' 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-4100'/>
+          <typedef-decl name='size_type' type-id='type-id-4094' 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-4095'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__const_void_pointer' type-id='type-id-4102' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-4101'/>
+          <typedef-decl name='__const_void_pointer' type-id='type-id-4097' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' id='type-id-4096'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_void_pointer' type-id='type-id-4101' 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-4103'/>
+          <typedef-decl name='const_void_pointer' type-id='type-id-4096' 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-4098'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3953' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3947'/>
+          <typedef-decl name='rebind_alloc&lt;mongo::executor::RemoteCommandRequest&gt;' type-id='type-id-3948' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='197' column='1' id='type-id-3942'/>
         </member-type>
         <member-function access='private' static='yes'>
           <function-decl name='_S_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE17_S_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-4104'/>
+            <return type-id='type-id-4099'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_const_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE23_S_const_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-4105'/>
+            <return type-id='type-id-4100'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_void_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE22_S_void_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-4106'/>
+            <return type-id='type-id-4101'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_const_void_pointer_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE28_S_const_void_pointer_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-4102'/>
+            <return type-id='type-id-4097'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_difference_type_helper' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE25_S_difference_type_helperEz' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter is-variadic='yes'/>
-            <return type-id='type-id-4107'/>
+            <return type-id='type-id-4102'/>
           </function-decl>
         </member-function>
         <member-function access='private' static='yes'>
@@ -40389,96 +40384,96 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE8allocateERS3_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='356' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4043'/>
-            <parameter type-id='type-id-4100'/>
-            <return type-id='type-id-3945'/>
+            <parameter type-id='type-id-4038'/>
+            <parameter type-id='type-id-4095'/>
+            <return type-id='type-id-3940'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='allocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE8allocateERS3_mPKv' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='371' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4043'/>
-            <parameter type-id='type-id-4100'/>
-            <parameter type-id='type-id-4103'/>
-            <return type-id='type-id-3945'/>
+            <parameter type-id='type-id-4038'/>
+            <parameter type-id='type-id-4095'/>
+            <parameter type-id='type-id-4098'/>
+            <return type-id='type-id-3940'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='deallocate' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE10deallocateERS3_PS2_m' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE10deallocateERS3_PS2_m'>
-            <parameter type-id='type-id-4043'/>
-            <parameter type-id='type-id-3945'/>
-            <parameter type-id='type-id-4100'/>
+            <parameter type-id='type-id-4038'/>
+            <parameter type-id='type-id-3940'/>
+            <parameter type-id='type-id-4095'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='max_size' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE8max_sizeERKS3_' 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'>
-            <parameter type-id='type-id-3900'/>
-            <return type-id='type-id-4100'/>
+            <parameter type-id='type-id-3895'/>
+            <return type-id='type-id-4095'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='select_on_container_copy_construction' mangled-name='_ZNSt16allocator_traitsISaIN5mongo8executor20RemoteCommandRequestEEE37select_on_container_copy_constructionERKS3_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/alloc_traits.h' line='433' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3900'/>
-            <return type-id='type-id-3851'/>
+            <parameter type-id='type-id-3895'/>
+            <return type-id='type-id-3846'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='pointer_traits&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/ptr_traits.h' line='150' column='1' id='type-id-4108'>
+      <class-decl name='pointer_traits&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/ptr_traits.h' line='150' column='1' id='type-id-4103'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2646' 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-4109'/>
+          <typedef-decl name='pointer' type-id='type-id-2646' 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-4104'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-4105'/>
+          <typedef-decl name='rebind&lt;const value_type&gt;' type-id='type-id-2649' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-4100'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-4106'/>
+          <typedef-decl name='rebind&lt;void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-4101'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-4102'/>
+          <typedef-decl name='rebind&lt;const void&gt;' type-id='type-id-286' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='160' column='1' id='type-id-4097'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-4107'/>
+          <typedef-decl name='difference_type' type-id='type-id-287' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='157' column='1' id='type-id-4102'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='pointer_to' mangled-name='_ZNSt14pointer_traitsIPN5mongo8executor20RemoteCommandRequestEE10pointer_toERS2_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4110'/>
-            <return type-id='type-id-4109'/>
+            <parameter type-id='type-id-4105'/>
+            <return type-id='type-id-4104'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__ptrtr_not_void&lt;mongo::executor::RemoteCommandRequest, 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/ptr_traits.h' line='105' column='1' id='type-id-4111'>
+      <class-decl name='__ptrtr_not_void&lt;mongo::executor::RemoteCommandRequest, 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/ptr_traits.h' line='105' column='1' id='type-id-4106'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-1314' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-4112'/>
+          <typedef-decl name='__type' type-id='type-id-1314' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/ptr_traits.h' line='107' column='1' id='type-id-4107'/>
         </member-type>
       </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-3954'>
+      <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-3949'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3898' 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-3953'/>
+          <typedef-decl name='__type' 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='65' column='1' id='type-id-3948'/>
         </member-type>
       </class-decl>
-      <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-3858'/>
-      <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-3860'/>
-      <class-decl name='__add_rvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackHandle &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-3634'>
+      <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-3853'/>
+      <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-3855'/>
+      <class-decl name='__add_rvalue_reference_helper&lt;mongo::executor::TaskExecutor::CallbackHandle &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-3629'>
         <member-type access='public'>
           <typedef-decl name='type' type-id='type-id-932' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-2236'/>
         </member-type>
       </class-decl>
-      <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-3633'>
+      <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-3628'>
         <member-type access='public'>
           <typedef-decl name='type' type-id='type-id-1240' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/type_traits' line='1531' column='1' id='type-id-2239'/>
         </member-type>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &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/functional' line='1210' column='1' id='type-id-4113'>
+      <class-decl name='_Maybe_wrap_member_pointer&lt;void (mongo::repl::ReplicationExecutor::*)(const mongo::executor::TaskExecutor::CallbackHandle &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/functional' line='1210' column='1' id='type-id-4108'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-3981' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1212' column='1' id='type-id-4114'/>
+          <typedef-decl name='type' type-id='type-id-3976' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1212' column='1' id='type-id-4109'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEE9__do_wrapES9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIMN5mongo4repl19ReplicationExecutorEFvRKNS0_8executor12TaskExecutor14CallbackHandleEEE9__do_wrapES9_'>
-            <return type-id='type-id-4114'/>
+            <return type-id='type-id-4109'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Destroy_aux&lt;false&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/stl_construct.h' line='96' column='1' id='type-id-4115'>
+      <class-decl name='_Destroy_aux&lt;false&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/stl_construct.h' line='96' column='1' id='type-id-4110'>
         <member-function access='public' static='yes'>
           <function-decl name='__destroy&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEEvT_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_construct.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12_Destroy_auxILb0EE9__destroyIPN5mongo8executor12TaskExecutor14CallbackHandleEEEvT_S7_'>
             <parameter type-id='type-id-2632'/>
@@ -40494,17 +40489,17 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__uninitialized_copy&lt;false&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/stl_uninitialized.h' line='64' column='1' id='type-id-4116'>
+      <class-decl name='__uninitialized_copy&lt;false&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/stl_uninitialized.h' line='64' column='1' id='type-id-4111'>
         <member-function access='public' static='yes'>
           <function-decl name='__uninit_copy&lt;std::move_iterator&lt;mongo::executor::TaskExecutor::CallbackHandle *&gt;, mongo::executor::TaskExecutor::CallbackHandle *&gt;' mangled-name='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES7_EET0_T_SA_S9_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_uninitialized.h' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt20__uninitialized_copyILb0EE13__uninit_copyISt13move_iteratorIPN5mongo8executor12TaskExecutor14CallbackHandleEES7_EET0_T_SA_S9_'>
-            <parameter type-id='type-id-4031'/>
-            <parameter type-id='type-id-4031'/>
+            <parameter type-id='type-id-4026'/>
+            <parameter type-id='type-id-4026'/>
             <parameter type-id='type-id-2632'/>
             <return type-id='type-id-2632'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-4117'>
+      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *))(const mongo::executor::TaskExecutor::RemoteCommandCallbackArgs &amp;, mongo::repl::ScatterGatherRunner *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-4112'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-879'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE9_M_invokeERKSt9_Any_dataS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEESt12_PlaceholderILi1EESA_EEE9_M_invokeERKSt9_Any_dataS5_'>
@@ -40514,39 +40509,39 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::repl::ScatterGatherRunner *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-4118'>
+      <class-decl name='_Mu&lt;mongo::repl::ScatterGatherRunner *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-4113'>
         <member-function access='public' static='yes'>
           <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-4119' is-artificial='yes'/>
-            <parameter type-id='type-id-3722'/>
+            <parameter type-id='type-id-4114' is-artificial='yes'/>
+            <parameter type-id='type-id-3717'/>
             <parameter type-id='type-id-2242'/>
-            <return type-id='type-id-3722'/>
+            <return type-id='type-id-3717'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <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-4119' is-artificial='yes'/>
-            <parameter type-id='type-id-3722'/>
+            <parameter type-id='type-id-4114' is-artificial='yes'/>
+            <parameter type-id='type-id-3717'/>
             <parameter type-id='type-id-1396'/>
-            <return type-id='type-id-3722'/>
+            <return type-id='type-id-3717'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&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='1191' column='1' id='type-id-4120'>
+      <class-decl name='_Maybe_wrap_member_pointer&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='1191' column='1' id='type-id-4115'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapERKSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1196' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4121'/>
-            <return type-id='type-id-4121'/>
+            <parameter type-id='type-id-4116'/>
+            <return type-id='type-id-4116'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapEOSA_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor25RemoteCommandCallbackArgsEPNS0_4repl19ScatterGatherRunnerEEE9__do_wrapEOSA_'>
-            <parameter type-id='type-id-3620'/>
-            <return type-id='type-id-3620'/>
+            <parameter type-id='type-id-3615'/>
+            <return type-id='type-id-3615'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-4122'>
+      <class-decl name='_Function_handler&lt;void (const mongo::executor::TaskExecutor::CallbackArgs &amp;), std::_Bind&lt;void (*(std::_Placeholder&lt;1&gt;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *))(const mongo::executor::TaskExecutor::CallbackArgs &amp;, mongo::repl::ScatterGatherRunner *, mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *)&gt; &gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2030' column='1' id='type-id-4117'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-883'/>
         <member-function access='public' static='yes'>
           <function-decl name='_M_invoke' mangled-name='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE9_M_invokeERKSt9_Any_dataS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='2037' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17_Function_handlerIFvRKN5mongo8executor12TaskExecutor12CallbackArgsEESt5_BindIFPFvS5_PNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEESt12_PlaceholderILi1EESA_SE_EEE9_M_invokeERKSt9_Any_dataS5_'>
@@ -40556,27 +40551,27 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Mu&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-4123'>
+      <class-decl name='_Mu&lt;mongo::StatusWith&lt;mongo::executor::TaskExecutor::EventHandle&gt; *, false, false&gt;' size-in-bits='8' visibility='default' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1167' column='1' id='type-id-4118'>
         <member-function access='public' static='yes'>
           <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-4124' is-artificial='yes'/>
-            <parameter type-id='type-id-3777'/>
+            <parameter type-id='type-id-4119' is-artificial='yes'/>
+            <parameter type-id='type-id-3772'/>
             <parameter type-id='type-id-1396'/>
-            <return type-id='type-id-3777'/>
+            <return type-id='type-id-3772'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_wrap_member_pointer&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='1191' column='1' id='type-id-4125'>
+      <class-decl name='_Maybe_wrap_member_pointer&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='1191' column='1' id='type-id-4120'>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapERKSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1196' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4126'/>
-            <return type-id='type-id-4126'/>
+            <parameter type-id='type-id-4121'/>
+            <return type-id='type-id-4121'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='__do_wrap' mangled-name='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapEOSE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/functional' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt26_Maybe_wrap_member_pointerIPFvRKN5mongo8executor12TaskExecutor12CallbackArgsEPNS0_4repl19ScatterGatherRunnerEPNS0_10StatusWithINS2_11EventHandleEEEEE9__do_wrapEOSE_'>
-            <parameter type-id='type-id-3625'/>
-            <return type-id='type-id-3625'/>
+            <parameter type-id='type-id-3620'/>
+            <return type-id='type-id-3620'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -40587,89 +40582,89 @@
       </namespace-decl>
 
 
-      <class-decl name='ObjScopeGuardImpl1&lt;mongo::repl::ScatterGatherRunner, void (mongo::repl::ScatterGatherRunner::*)(mongo::repl::ReplicationExecutor *), mongo::repl::ReplicationExecutor *&gt;' size-in-bits='320' visibility='default' filepath='src/mongo/util/scopeguard.h' line='277' column='1' id='type-id-4127'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-4128'/>
+      <class-decl name='ObjScopeGuardImpl1&lt;mongo::repl::ScatterGatherRunner, void (mongo::repl::ScatterGatherRunner::*)(mongo::repl::ReplicationExecutor *), mongo::repl::ReplicationExecutor *&gt;' size-in-bits='320' visibility='default' filepath='src/mongo/util/scopeguard.h' line='277' column='1' id='type-id-4122'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-4123'/>
         <data-member access='protected' layout-offset-in-bits='64'>
-          <var-decl name='obj_' type-id='type-id-3701' visibility='default' filepath='src/mongo/util/scopeguard.h' line='294' column='1'/>
+          <var-decl name='obj_' type-id='type-id-3696' visibility='default' filepath='src/mongo/util/scopeguard.h' line='294' column='1'/>
         </data-member>
         <data-member access='protected' layout-offset-in-bits='256'>
           <var-decl name='p1_' type-id='type-id-3212' visibility='default' filepath='src/mongo/util/scopeguard.h' line='296' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='MakeObjGuard' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E12MakeObjGuardERS2_S6_S4_' filepath='src/mongo/util/scopeguard.h' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E12MakeObjGuardERS2_S6_S4_'>
-            <parameter type-id='type-id-3701'/>
+            <parameter type-id='type-id-3696'/>
             <parameter type-id='type-id-940'/>
-            <return type-id='type-id-4127'/>
+            <return type-id='type-id-4122'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~ObjScopeGuardImpl1' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_ED2Ev' filepath='src/mongo/util/scopeguard.h' line='283' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_ED2Ev'>
-            <parameter type-id='type-id-4129' is-artificial='yes'/>
+            <parameter type-id='type-id-4124' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Execute' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E7ExecuteEv' filepath='src/mongo/util/scopeguard.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_E7ExecuteEv'>
-            <parameter type-id='type-id-4129' is-artificial='yes'/>
+            <parameter type-id='type-id-4124' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='ObjScopeGuardImpl1' mangled-name='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_EC2ERS2_S6_S4_' filepath='src/mongo/util/scopeguard.h' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS2_FvPNS1_19ReplicationExecutorEES4_EC2ERS2_S6_S4_'>
-            <parameter type-id='type-id-4129' is-artificial='yes'/>
-            <parameter type-id='type-id-3701'/>
+            <parameter type-id='type-id-4124' is-artificial='yes'/>
+            <parameter type-id='type-id-3696'/>
             <parameter type-id='type-id-940'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='ScopeGuardImplBase' size-in-bits='8' visibility='default' filepath='src/mongo/util/scopeguard.h' line='85' column='1' id='type-id-4128'>
+      <class-decl name='ScopeGuardImplBase' size-in-bits='8' visibility='default' filepath='src/mongo/util/scopeguard.h' line='85' column='1' id='type-id-4123'>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='dismissed_' type-id='type-id-19' visibility='default' filepath='src/mongo/util/scopeguard.h' line='104' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZN5mongo18ScopeGuardImplBaseaSERKS0_' filepath='src/mongo/util/scopeguard.h' line='86' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4130' is-artificial='yes'/>
-            <parameter type-id='type-id-4131'/>
-            <return type-id='type-id-4132'/>
+            <parameter type-id='type-id-4125' is-artificial='yes'/>
+            <parameter type-id='type-id-4126'/>
+            <return type-id='type-id-4127'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes'>
           <function-decl name='~ScopeGuardImplBase' mangled-name='_ZN5mongo18ScopeGuardImplBaseD2Ev' filepath='src/mongo/util/scopeguard.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ScopeGuardImplBaseD2Ev'>
-            <parameter type-id='type-id-4130' is-artificial='yes'/>
+            <parameter type-id='type-id-4125' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='ScopeGuardImplBase' filepath='src/mongo/util/scopeguard.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4130' is-artificial='yes'/>
-            <parameter type-id='type-id-4131'/>
+            <parameter type-id='type-id-4125' is-artificial='yes'/>
+            <parameter type-id='type-id-4126'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='ScopeGuardImplBase' mangled-name='_ZN5mongo18ScopeGuardImplBaseC2Ev' filepath='src/mongo/util/scopeguard.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ScopeGuardImplBaseC2Ev'>
-            <parameter type-id='type-id-4130' is-artificial='yes'/>
+            <parameter type-id='type-id-4125' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='Dismiss' mangled-name='_ZNK5mongo18ScopeGuardImplBase7DismissEv' filepath='src/mongo/util/scopeguard.h' line='109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK5mongo18ScopeGuardImplBase7DismissEv'>
-            <parameter type-id='type-id-4133' is-artificial='yes'/>
+            <parameter type-id='type-id-4128' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='SafeExecute&lt;mongo::ObjScopeGuardImpl1&lt;mongo::repl::ScatterGatherRunner, void (mongo::repl::ScatterGatherRunner::*)(mongo::repl::ReplicationExecutor *), mongo::repl::ReplicationExecutor *&gt; &gt;' mangled-name='_ZN5mongo18ScopeGuardImplBase11SafeExecuteINS_18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS4_FvPNS3_19ReplicationExecutorEES6_EEEEvRT_' filepath='src/mongo/util/scopeguard.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo18ScopeGuardImplBase11SafeExecuteINS_18ObjScopeGuardImpl1INS_4repl19ScatterGatherRunnerEMS4_FvPNS3_19ReplicationExecutorEES6_EEEEvRT_'>
-            <parameter type-id='type-id-4134'/>
+            <parameter type-id='type-id-4129'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-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-3654' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
+        <parameter type-id='type-id-3649' name='obj' filepath='src/mongo/util/scopeguard.h' line='313' column='1'/>
         <parameter type-id='type-id-940' name='p1' filepath='src/mongo/util/scopeguard.h' line='314' column='1'/>
-        <return type-id='type-id-4127'/>
+        <return type-id='type-id-4122'/>
       </function-decl>
       <function-decl name='fassert' mangled-name='_ZN5mongo7fassertEiRKNS_6StatusE' filepath='src/mongo/util/assert_util.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5mongo7fassertEiRKNS_6StatusE'>
         <parameter type-id='type-id-15' name='msgid' filepath='src/mongo/util/assert_util.h' line='229' column='1'/>
@@ -40677,54 +40672,54 @@
         <return type-id='type-id-11'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-4128' size-in-bits='64' id='type-id-4132'/>
-    <pointer-type-def type-id='type-id-4128' size-in-bits='64' id='type-id-4130'/>
-    <qualified-type-def type-id='type-id-4128' const='yes' id='type-id-4135'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4135' size-in-bits='64' id='type-id-4131'/>
-    <pointer-type-def type-id='type-id-4135' size-in-bits='64' id='type-id-4133'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4127' size-in-bits='64' id='type-id-4134'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4123' size-in-bits='64' id='type-id-4127'/>
+    <pointer-type-def type-id='type-id-4123' size-in-bits='64' id='type-id-4125'/>
+    <qualified-type-def type-id='type-id-4123' const='yes' id='type-id-4130'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4130' size-in-bits='64' id='type-id-4126'/>
+    <pointer-type-def type-id='type-id-4130' size-in-bits='64' id='type-id-4128'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4122' size-in-bits='64' id='type-id-4129'/>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='operator!=&lt;mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxneIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESE_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxneIPN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESE_'>
-        <parameter type-id='type-id-4136' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
-        <parameter type-id='type-id-4136' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
+        <parameter type-id='type-id-4131' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='829' column='1'/>
+        <parameter type-id='type-id-4131' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='830' column='1'/>
         <return type-id='type-id-19'/>
       </function-decl>
       <function-decl name='operator==&lt;const mongo::executor::TaskExecutor::CallbackHandle *, std::vector&lt;mongo::executor::TaskExecutor::CallbackHandle, std::allocator&lt;mongo::executor::TaskExecutor::CallbackHandle&gt; &gt; &gt;' mangled-name='_ZN9__gnu_cxxeqIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESF_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN9__gnu_cxxeqIPKN5mongo8executor12TaskExecutor14CallbackHandleESt6vectorIS4_SaIS4_EEEEbRKNS_17__normal_iteratorIT_T0_EESF_'>
-        <parameter type-id='type-id-4137' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='815' column='1'/>
-        <parameter type-id='type-id-4137' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='816' column='1'/>
+        <parameter type-id='type-id-4132' name='__lhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='815' column='1'/>
+        <parameter type-id='type-id-4132' name='__rhs' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/bits/stl_iterator.h' line='816' column='1'/>
         <return type-id='type-id-19'/>
       </function-decl>
-      <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-3838'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3928'/>
+      <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-3833'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3923'/>
         <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-3889'>
+          <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-3884'>
             <member-type access='public'>
-              <typedef-decl name='other' 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='169' column='1' id='type-id-3830'/>
+              <typedef-decl name='other' type-id='type-id-3885' 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-3825'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3888' 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-3831'/>
+          <typedef-decl name='pointer' type-id='type-id-3883' 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-3826'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3927' 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-3841'/>
+          <typedef-decl name='value_type' type-id='type-id-3922' 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-3836'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3840' 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-3748'/>
+          <typedef-decl name='reference' type-id='type-id-3835' 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-3743'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3839' 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-3750'/>
+          <typedef-decl name='const_reference' type-id='type-id-3834' 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-3745'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='_S_select_on_copy' mangled-name='_ZN9__gnu_cxx14__alloc_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE17_S_select_on_copyERKS5_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3813'/>
-            <return type-id='type-id-3737'/>
+            <parameter type-id='type-id-3808'/>
+            <return type-id='type-id-3732'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_on_swap' mangled-name='_ZN9__gnu_cxx14__alloc_traitsISaIN5mongo8executor12TaskExecutor14CallbackHandleEEE10_S_on_swapERS5_S7_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3967'/>
-            <parameter type-id='type-id-3967'/>
+            <parameter type-id='type-id-3962'/>
+            <parameter type-id='type-id-3962'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -40759,37 +40754,37 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <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-3924'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3951'/>
+      <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-3919'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3946'/>
         <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-3946'>
+          <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-3941'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3947' 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-3916'/>
+              <typedef-decl name='other' type-id='type-id-3942' 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-3911'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3945' 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-3917'/>
+          <typedef-decl name='pointer' type-id='type-id-3940' 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-3912'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='value_type' type-id='type-id-3950' 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-3931'/>
+          <typedef-decl name='value_type' type-id='type-id-3945' 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-3926'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3926' 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-3862'/>
+          <typedef-decl name='reference' type-id='type-id-3921' 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-3857'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3925' 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-3864'/>
+          <typedef-decl name='const_reference' type-id='type-id-3920' 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-3859'/>
         </member-type>
         <member-function access='public' static='yes'>
           <function-decl name='_S_select_on_copy' mangled-name='_ZN9__gnu_cxx14__alloc_traitsISaIN5mongo8executor20RemoteCommandRequestEEE17_S_select_on_copyERKS4_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3900'/>
-            <return type-id='type-id-3851'/>
+            <parameter type-id='type-id-3895'/>
+            <return type-id='type-id-3846'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='_S_on_swap' mangled-name='_ZN9__gnu_cxx14__alloc_traitsISaIN5mongo8executor20RemoteCommandRequestEEE10_S_on_swapERS4_S6_' filepath='/usr/bin/../lib/gcc/x86_64-linux-gnu/4.9/../../../../include/c++/4.9/ext/alloc_traits.h' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-4043'/>
-            <parameter type-id='type-id-4043'/>
+            <parameter type-id='type-id-4038'/>
+            <parameter type-id='type-id-4038'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -40824,77 +40819,77 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <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-3854'/>
-      <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-3856'/>
+      <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-3849'/>
+      <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-3851'/>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3878' size-in-bits='64' id='type-id-4136'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3877' size-in-bits='64' id='type-id-4137'/>
-    <pointer-type-def type-id='type-id-3927' size-in-bits='64' id='type-id-3963'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3975' size-in-bits='64' id='type-id-3973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3737' size-in-bits='64' id='type-id-3967'/>
-    <pointer-type-def type-id='type-id-4127' size-in-bits='64' id='type-id-4129'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3657' size-in-bits='64' id='type-id-3976'/>
-    <pointer-type-def type-id='type-id-3981' size-in-bits='64' id='type-id-3990'/>
-    <qualified-type-def type-id='type-id-3981' const='yes' id='type-id-4138'/>
-    <pointer-type-def type-id='type-id-4138' size-in-bits='64' id='type-id-3991'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3998' size-in-bits='64' id='type-id-4007'/>
-    <qualified-type-def type-id='type-id-3998' const='yes' id='type-id-4139'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4139' size-in-bits='64' id='type-id-4008'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4006' size-in-bits='64' id='type-id-4009'/>
-    <qualified-type-def type-id='type-id-4006' const='yes' id='type-id-4140'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4140' size-in-bits='64' id='type-id-4010'/>
-    <pointer-type-def type-id='type-id-3998' size-in-bits='64' id='type-id-4011'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3998' size-in-bits='64' id='type-id-4012'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3993' size-in-bits='64' id='type-id-4000'/>
-    <qualified-type-def type-id='type-id-3993' const='yes' id='type-id-4141'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4141' size-in-bits='64' id='type-id-4001'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3999' size-in-bits='64' id='type-id-4002'/>
-    <qualified-type-def type-id='type-id-3999' const='yes' id='type-id-4142'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4142' size-in-bits='64' id='type-id-4003'/>
-    <pointer-type-def type-id='type-id-3993' size-in-bits='64' id='type-id-4004'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3993' size-in-bits='64' id='type-id-4005'/>
-    <pointer-type-def type-id='type-id-3982' size-in-bits='64' id='type-id-3994'/>
-    <qualified-type-def type-id='type-id-3982' const='yes' id='type-id-4143'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4143' size-in-bits='64' id='type-id-3995'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3982' size-in-bits='64' id='type-id-3996'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3982' size-in-bits='64' id='type-id-3997'/>
-    <pointer-type-def type-id='type-id-3979' size-in-bits='64' id='type-id-3983'/>
-    <qualified-type-def type-id='type-id-3979' const='yes' id='type-id-4144'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4144' size-in-bits='64' id='type-id-3984'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3979' size-in-bits='64' id='type-id-3985'/>
-    <reference-type-def kind='rvalue' type-id='type-id-3981' size-in-bits='64' id='type-id-3986'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4016' size-in-bits='64' id='type-id-4018'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3979' size-in-bits='64' id='type-id-4017'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4020' size-in-bits='64' id='type-id-4022'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3981' size-in-bits='64' id='type-id-4021'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4024' size-in-bits='64' id='type-id-4025'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4027' size-in-bits='64' id='type-id-4028'/>
-    <pointer-type-def type-id='type-id-4031' size-in-bits='64' id='type-id-4038'/>
-    <qualified-type-def type-id='type-id-4031' const='yes' id='type-id-4145'/>
-    <pointer-type-def type-id='type-id-4145' size-in-bits='64' id='type-id-4039'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4033' size-in-bits='64' id='type-id-4035'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4031' size-in-bits='64' id='type-id-4040'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4145' size-in-bits='64' id='type-id-4041'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3851' size-in-bits='64' id='type-id-4043'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4045' size-in-bits='64' id='type-id-4047'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1241' size-in-bits='64' id='type-id-4046'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4051' size-in-bits='64' id='type-id-4052'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4056' size-in-bits='64' id='type-id-4058'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3617' size-in-bits='64' id='type-id-4057'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4060' size-in-bits='64' id='type-id-4061'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4063' size-in-bits='64' id='type-id-4064'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4066' size-in-bits='64' id='type-id-4067'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4069' size-in-bits='64' id='type-id-4070'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4072' size-in-bits='64' id='type-id-4074'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1479' size-in-bits='64' id='type-id-4073'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4078' size-in-bits='64' id='type-id-4079'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4081' size-in-bits='64' id='type-id-4083'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3623' size-in-bits='64' id='type-id-4082'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4085' size-in-bits='64' id='type-id-4086'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4088' size-in-bits='64' id='type-id-4089'/>
-    <reference-type-def kind='rvalue' type-id='type-id-4091' size-in-bits='64' id='type-id-4092'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4094' size-in-bits='64' id='type-id-4095'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4097' size-in-bits='64' id='type-id-4098'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3873' size-in-bits='64' id='type-id-4131'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3872' size-in-bits='64' id='type-id-4132'/>
+    <pointer-type-def type-id='type-id-3922' size-in-bits='64' id='type-id-3958'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3970' size-in-bits='64' id='type-id-3968'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3732' size-in-bits='64' id='type-id-3962'/>
+    <pointer-type-def type-id='type-id-4122' size-in-bits='64' id='type-id-4124'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3652' size-in-bits='64' id='type-id-3971'/>
+    <pointer-type-def type-id='type-id-3976' size-in-bits='64' id='type-id-3985'/>
+    <qualified-type-def type-id='type-id-3976' const='yes' id='type-id-4133'/>
+    <pointer-type-def type-id='type-id-4133' size-in-bits='64' id='type-id-3986'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3993' size-in-bits='64' id='type-id-4002'/>
+    <qualified-type-def type-id='type-id-3993' const='yes' id='type-id-4134'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4134' size-in-bits='64' id='type-id-4003'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4001' size-in-bits='64' id='type-id-4004'/>
+    <qualified-type-def type-id='type-id-4001' const='yes' id='type-id-4135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4135' size-in-bits='64' id='type-id-4005'/>
+    <pointer-type-def type-id='type-id-3993' size-in-bits='64' id='type-id-4006'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3993' size-in-bits='64' id='type-id-4007'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3988' size-in-bits='64' id='type-id-3995'/>
+    <qualified-type-def type-id='type-id-3988' const='yes' id='type-id-4136'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4136' size-in-bits='64' id='type-id-3996'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3994' size-in-bits='64' id='type-id-3997'/>
+    <qualified-type-def type-id='type-id-3994' const='yes' id='type-id-4137'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4137' size-in-bits='64' id='type-id-3998'/>
+    <pointer-type-def type-id='type-id-3988' size-in-bits='64' id='type-id-3999'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3988' size-in-bits='64' id='type-id-4000'/>
+    <pointer-type-def type-id='type-id-3977' size-in-bits='64' id='type-id-3989'/>
+    <qualified-type-def type-id='type-id-3977' const='yes' id='type-id-4138'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4138' size-in-bits='64' id='type-id-3990'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3977' size-in-bits='64' id='type-id-3991'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3977' size-in-bits='64' id='type-id-3992'/>
+    <pointer-type-def type-id='type-id-3974' size-in-bits='64' id='type-id-3978'/>
+    <qualified-type-def type-id='type-id-3974' const='yes' id='type-id-4139'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4139' size-in-bits='64' id='type-id-3979'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3974' size-in-bits='64' id='type-id-3980'/>
+    <reference-type-def kind='rvalue' type-id='type-id-3976' size-in-bits='64' id='type-id-3981'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4011' size-in-bits='64' id='type-id-4013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3974' size-in-bits='64' id='type-id-4012'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4015' size-in-bits='64' id='type-id-4017'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3976' size-in-bits='64' id='type-id-4016'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4019' size-in-bits='64' id='type-id-4020'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4022' size-in-bits='64' id='type-id-4023'/>
+    <pointer-type-def type-id='type-id-4026' size-in-bits='64' id='type-id-4033'/>
+    <qualified-type-def type-id='type-id-4026' const='yes' id='type-id-4140'/>
+    <pointer-type-def type-id='type-id-4140' size-in-bits='64' id='type-id-4034'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4028' size-in-bits='64' id='type-id-4030'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4026' size-in-bits='64' id='type-id-4035'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4140' size-in-bits='64' id='type-id-4036'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3846' size-in-bits='64' id='type-id-4038'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4040' size-in-bits='64' id='type-id-4042'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1241' size-in-bits='64' id='type-id-4041'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4046' size-in-bits='64' id='type-id-4047'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4051' size-in-bits='64' id='type-id-4053'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3612' size-in-bits='64' id='type-id-4052'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4055' size-in-bits='64' id='type-id-4056'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4058' size-in-bits='64' id='type-id-4059'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4061' size-in-bits='64' id='type-id-4062'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4064' size-in-bits='64' id='type-id-4065'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4067' size-in-bits='64' id='type-id-4069'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1479' size-in-bits='64' id='type-id-4068'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4073' size-in-bits='64' id='type-id-4074'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4076' size-in-bits='64' id='type-id-4078'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3618' size-in-bits='64' id='type-id-4077'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4080' size-in-bits='64' id='type-id-4081'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4083' size-in-bits='64' id='type-id-4084'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4086' size-in-bits='64' id='type-id-4087'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4089' size-in-bits='64' id='type-id-4090'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4092' size-in-bits='64' id='type-id-4093'/>
     <namespace-decl name='boost'>
 
 
@@ -40903,31 +40898,31 @@
 
 
 
-      <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-4146'>
+      <class-decl name='remove_reference&lt;boost::optional&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-4141'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2783' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-4147'/>
+          <typedef-decl name='type' type-id='type-id-2783' filepath='src/third_party/boost-1.56.0/boost/type_traits/remove_reference.hpp' line='42' column='1' id='type-id-4142'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;boost::optional&lt;mongo::executor::TaskExecutor::EventHandle&gt; &amp;&gt;' mangled-name='_ZN5boost4moveIRNS_8optionalIN5mongo8executor12TaskExecutor11EventHandleEEEEEONS_16remove_referenceIT_E4typeEOS9_' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN5boost4moveIRNS_8optionalIN5mongo8executor12TaskExecutor11EventHandleEEEEEONS_16remove_referenceIT_E4typeEOS9_'>
         <parameter type-id='type-id-3046' name='t' filepath='src/third_party/boost-1.56.0/boost/move/utility.hpp' line='138' column='1'/>
-        <return type-id='type-id-4148'/>
+        <return type-id='type-id-4143'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='rvalue' type-id='type-id-4147' size-in-bits='64' id='type-id-4148'/>
+    <reference-type-def kind='rvalue' type-id='type-id-4142' size-in-bits='64' id='type-id-4143'/>
 
 
 
-    <pointer-type-def type-id='type-id-3950' size-in-bits='64' id='type-id-4104'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4112' size-in-bits='64' id='type-id-4110'/>
-    <qualified-type-def type-id='type-id-4118' volatile='yes' id='type-id-4149'/>
-    <qualified-type-def type-id='type-id-4149' const='yes' id='type-id-4150'/>
-    <pointer-type-def type-id='type-id-4150' size-in-bits='64' id='type-id-4119'/>
-    <qualified-type-def type-id='type-id-3617' const='yes' id='type-id-4151'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4151' size-in-bits='64' id='type-id-4121'/>
-    <qualified-type-def type-id='type-id-4123' volatile='yes' id='type-id-4152'/>
-    <qualified-type-def type-id='type-id-4152' const='yes' id='type-id-4153'/>
-    <pointer-type-def type-id='type-id-4153' size-in-bits='64' id='type-id-4124'/>
-    <qualified-type-def type-id='type-id-3623' const='yes' id='type-id-4154'/>
-    <reference-type-def kind='lvalue' type-id='type-id-4154' size-in-bits='64' id='type-id-4126'/>
+    <pointer-type-def type-id='type-id-3945' size-in-bits='64' id='type-id-4099'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4107' size-in-bits='64' id='type-id-4105'/>
+    <qualified-type-def type-id='type-id-4113' volatile='yes' id='type-id-4144'/>
+    <qualified-type-def type-id='type-id-4144' const='yes' id='type-id-4145'/>
+    <pointer-type-def type-id='type-id-4145' size-in-bits='64' id='type-id-4114'/>
+    <qualified-type-def type-id='type-id-3612' const='yes' id='type-id-4146'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4146' size-in-bits='64' id='type-id-4116'/>
+    <qualified-type-def type-id='type-id-4118' volatile='yes' id='type-id-4147'/>
+    <qualified-type-def type-id='type-id-4147' const='yes' id='type-id-4148'/>
+    <pointer-type-def type-id='type-id-4148' size-in-bits='64' id='type-id-4119'/>
+    <qualified-type-def type-id='type-id-3618' const='yes' id='type-id-4149'/>
+    <reference-type-def kind='lvalue' type-id='type-id-4149' size-in-bits='64' id='type-id-4121'/>
   </abi-instr>
 </abi-corpus>

diff --git a/tests/data/test-read-dwarf/test15-pr18892.so.abi b/tests/data/test-read-dwarf/test15-pr18892.so.abi
index 6350fbf..fd50749 100644 (file)
--- a/tests/data/test-read-dwarf/test15-pr18892.so.abi
+++ b/tests/data/test-read-dwarf/test15-pr18892.so.abi
@@ -24374,19 +24374,19 @@
       <return type-id='type-id-1750'/>
     </function-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-1746' size-in-bits='11904' id='type-id-1760'>
-      <subrange length='62' type-id='type-id-28' id='type-id-1761'/>
+    <array-type-def dimensions='1' type-id='type-id-1760' size-in-bits='11904' id='type-id-1761'>
+      <subrange length='62' type-id='type-id-28' id='type-id-1762'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-1760' const='yes' id='type-id-1762'/>
-    <var-decl name='__asan_cplus_demangle_operators' type-id='type-id-1762' mangled-name='__asan_cplus_demangle_operators' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='1688' column='1' elf-symbol-id='__asan_cplus_demangle_operators'/>
+    <qualified-type-def type-id='type-id-1746' const='yes' id='type-id-1760'/>
+    <var-decl name='__asan_cplus_demangle_operators' type-id='type-id-1761' mangled-name='__asan_cplus_demangle_operators' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='1688' column='1' elf-symbol-id='__asan_cplus_demangle_operators'/>
 
-    <array-type-def dimensions='1' type-id='type-id-1752' size-in-bits='8448' id='type-id-1763'>
-      <subrange length='33' type-id='type-id-28' id='type-id-1764'/>
+    <array-type-def dimensions='1' type-id='type-id-1763' size-in-bits='8448' id='type-id-1764'>
+      <subrange length='33' type-id='type-id-28' id='type-id-1765'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-1763' const='yes' id='type-id-1765'/>
-    <var-decl name='__asan_cplus_demangle_builtin_types' type-id='type-id-1765' mangled-name='__asan_cplus_demangle_builtin_types' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='2188' column='1' elf-symbol-id='__asan_cplus_demangle_builtin_types'/>
+    <qualified-type-def type-id='type-id-1752' const='yes' id='type-id-1763'/>
+    <var-decl name='__asan_cplus_demangle_builtin_types' type-id='type-id-1764' mangled-name='__asan_cplus_demangle_builtin_types' visibility='default' filepath='../../.././libsanitizer/libbacktrace/../../libiberty/cp-demangle.c' line='2188' column='1' elf-symbol-id='__asan_cplus_demangle_builtin_types'/>
     <function-decl name='free' filepath='/usr/include/stdlib.h' line='488' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-6'/>

diff --git a/tests/data/test-read-dwarf/test17-pr19027.so.abi b/tests/data/test-read-dwarf/test17-pr19027.so.abi
index 54626a6..6b5ca1b 100644 (file)
--- a/tests/data/test-read-dwarf/test17-pr19027.so.abi
+++ b/tests/data/test-read-dwarf/test17-pr19027.so.abi
@@ -751,47 +751,48 @@
       <parameter type-id='type-id-10' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-blob.cc' line='152' column='1'/>
       <return type-id='type-id-59'/>
     </function-decl>
+    <qualified-type-def type-id='type-id-28' const='yes' id='type-id-62'/>
     <function-type size-in-bits='64' id='type-id-30'>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-buffer-serialize.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
-    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-62'/>
+    <pointer-type-def type-id='type-id-50' size-in-bits='64' id='type-id-63'/>
     <function-decl name='hb_buffer_serialize_list_formats' mangled-name='hb_buffer_serialize_list_formats' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_list_formats'>
-      <return type-id='type-id-62'/>
+      <return type-id='type-id-63'/>
     </function-decl>
-    <enum-decl name='hb_buffer_serialize_format_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='305' column='1' id='type-id-63'>
+    <enum-decl name='hb_buffer_serialize_format_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='305' column='1' id='type-id-64'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FORMAT_TEXT' value='1413830740'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FORMAT_JSON' value='1246973774'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FORMAT_INVALID' value='0'/>
     </enum-decl>
     <function-decl name='hb_buffer_serialize_format_to_string' mangled-name='hb_buffer_serialize_format_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_format_to_string'>
-      <parameter type-id='type-id-63' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='80' column='1'/>
+      <parameter type-id='type-id-64' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='80' column='1'/>
       <return type-id='type-id-50'/>
     </function-decl>
-    <class-decl name='hb_buffer_t' size-in-bits='2752' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='46' column='1' id='type-id-64'>
+    <class-decl name='hb_buffer_t' size-in-bits='2752' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='46' column='1' id='type-id-65'>
       <member-type access='public'>
-        <typedef-decl name='scratch_buffer_t' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-65'/>
+        <typedef-decl name='scratch_buffer_t' type-id='type-id-39' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='190' column='1' id='type-id-66'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-49' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='unicode' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='51' column='1'/>
+        <var-decl name='unicode' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='51' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='flags' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='52' column='1'/>
+        <var-decl name='flags' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='52' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='992'>
-        <var-decl name='replacement' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='53' column='1'/>
+        <var-decl name='replacement' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='53' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='content_type' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='56' column='1'/>
+        <var-decl name='content_type' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='57' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
         <var-decl name='in_error' type-id='type-id-7' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='59' column='1'/>
@@ -815,117 +816,117 @@
         <var-decl name='allocated' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='info' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='68' column='1'/>
+        <var-decl name='info' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='out_info' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='69' column='1'/>
+        <var-decl name='out_info' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='pos' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='70' column='1'/>
+        <var-decl name='pos' type-id='type-id-73' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
         <var-decl name='serial' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='83' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1760'>
-        <var-decl name='allocated_var_bytes' type-id='type-id-73' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='86' column='1'/>
+        <var-decl name='allocated_var_bytes' type-id='type-id-74' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1856'>
-        <var-decl name='allocated_var_owner' type-id='type-id-74' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='87' column='1'/>
+        <var-decl name='allocated_var_owner' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='87' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='CONTEXT_LENGTH' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='92' column='1'/>
+        <var-decl name='CONTEXT_LENGTH' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='context' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='93' column='1'/>
+        <var-decl name='context' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='context_len' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='94' column='1'/>
+        <var-decl name='context_len' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='94' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='_static_assertion_on_line_48' mangled-name='_ZNK11hb_buffer_t28_static_assertion_on_line_48Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cur' mangled-name='_ZN11hb_buffer_t3curEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='72' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
-          <return type-id='type-id-80'/>
+          <return type-id='type-id-81'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cur' mangled-name='_ZNK11hb_buffer_t3curEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
-          <return type-id='type-id-81'/>
+          <return type-id='type-id-82'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cur_pos' mangled-name='_ZN11hb_buffer_t7cur_posEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
-          <return type-id='type-id-82'/>
+          <return type-id='type-id-83'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='cur_pos' mangled-name='_ZNK11hb_buffer_t7cur_posEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
-          <return type-id='type-id-83'/>
+          <return type-id='type-id-84'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='prev' mangled-name='_ZN11hb_buffer_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <return type-id='type-id-80'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <return type-id='type-id-81'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='prev' mangled-name='_ZNK11hb_buffer_t4prevEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
-          <return type-id='type-id-81'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <return type-id='type-id-82'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='has_separate_output' mangled-name='_ZNK11hb_buffer_t19has_separate_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='81' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='reset' mangled-name='_ZN11hb_buffer_t5resetEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clear' mangled-name='_ZN11hb_buffer_t5clearEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='backtrack_len' mangled-name='_ZNK11hb_buffer_t13backtrack_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='lookahead_len' mangled-name='_ZNK11hb_buffer_t13lookahead_lenEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-78' is-artificial='yes'/>
+          <parameter type-id='type-id-79' is-artificial='yes'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='next_serial' mangled-name='_ZN11hb_buffer_t11next_serialEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='allocate_var' mangled-name='_ZN11hb_buffer_t12allocate_varEjjPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='108' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-50'/>
@@ -934,7 +935,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='deallocate_var' mangled-name='_ZN11hb_buffer_t14deallocate_varEjjPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='109' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-50'/>
@@ -943,7 +944,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='assert_var' mangled-name='_ZN11hb_buffer_t10assert_varEjjPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-50'/>
@@ -952,28 +953,28 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='deallocate_var_all' mangled-name='_ZN11hb_buffer_t18deallocate_var_allEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='111' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN11hb_buffer_t3addEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='113' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_info' mangled-name='_ZN11hb_buffer_t8add_infoERK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-84'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-85'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='reverse_range' mangled-name='_ZN11hb_buffer_t13reverse_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='117' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
@@ -981,120 +982,120 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='reverse' mangled-name='_ZN11hb_buffer_t7reverseEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='reverse_clusters' mangled-name='_ZN11hb_buffer_t16reverse_clustersEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='119' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='guess_segment_properties' mangled-name='_ZN11hb_buffer_t24guess_segment_propertiesEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='120' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='swap_buffers' mangled-name='_ZN11hb_buffer_t12swap_buffersEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='remove_output' mangled-name='_ZN11hb_buffer_t13remove_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clear_output' mangled-name='_ZN11hb_buffer_t12clear_outputEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clear_positions' mangled-name='_ZN11hb_buffer_t15clear_positionsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='replace_glyphs' mangled-name='_ZN11hb_buffer_t14replace_glyphsEjjPKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='127' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-85'/>
+          <parameter type-id='type-id-86'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='replace_glyph' mangled-name='_ZN11hb_buffer_t13replace_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='output_glyph' mangled-name='_ZN11hb_buffer_t12output_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='output_info' mangled-name='_ZN11hb_buffer_t11output_infoERK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-84'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-85'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='copy_glyph' mangled-name='_ZN11hb_buffer_t10copy_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='136' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='move_to' mangled-name='_ZN11hb_buffer_t7move_toEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='137' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='next_glyph' mangled-name='_ZN11hb_buffer_t10next_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='skip_glyph' mangled-name='_ZN11hb_buffer_t10skip_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='reset_masks' mangled-name='_ZN11hb_buffer_t11reset_masksEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='158' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-87'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_masks' mangled-name='_ZN11hb_buffer_t9add_masksEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-87'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='set_masks' mangled-name='_ZN11hb_buffer_t9set_masksEjjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
-          <parameter type-id='type-id-86'/>
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
+          <parameter type-id='type-id-87'/>
+          <parameter type-id='type-id-87'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
@@ -1102,7 +1103,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='merge_clusters' mangled-name='_ZN11hb_buffer_t14merge_clustersEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
@@ -1110,7 +1111,7 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='merge_out_clusters' mangled-name='_ZN11hb_buffer_t18merge_out_clustersEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
@@ -1118,28 +1119,28 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='enlarge' mangled-name='_ZN11hb_buffer_t7enlargeEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='ensure' mangled-name='_ZN11hb_buffer_t6ensureEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='ensure_inplace' mangled-name='_ZN11hb_buffer_t14ensure_inplaceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='make_room_for' mangled-name='_ZN11hb_buffer_t13make_room_forEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-7'/>
@@ -1147,57 +1148,57 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='shift_forward' mangled-name='_ZN11hb_buffer_t13shift_forwardEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_scratch_buffer' mangled-name='_ZN11hb_buffer_t18get_scratch_bufferEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-60'/>
-          <return type-id='type-id-87'/>
+          <return type-id='type-id-88'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='clear_context' mangled-name='_ZN11hb_buffer_t13clear_contextEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-private.hh' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-79' is-artificial='yes'/>
+          <parameter type-id='type-id-80' is-artificial='yes'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <class-decl name='hb_unicode_funcs_t' size-in-bits='2560' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='64' column='1' id='type-id-88'>
+    <class-decl name='hb_unicode_funcs_t' size-in-bits='2560' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='64' column='1' id='type-id-89'>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='203' column='1' id='type-id-89'>
+        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='203' column='1' id='type-id-90'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='combining_class' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='combining_class' type-id='type-id-91' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='eastasian_width' type-id='type-id-91' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='eastasian_width' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='general_category' type-id='type-id-92' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='general_category' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='mirroring' type-id='type-id-93' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='mirroring' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='256'>
-            <var-decl name='script' type-id='type-id-94' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='script' type-id='type-id-95' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='320'>
-            <var-decl name='compose' type-id='type-id-95' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='compose' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='384'>
-            <var-decl name='decompose' type-id='type-id-96' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='decompose' type-id='type-id-97' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='448'>
-            <var-decl name='decompose_compatibility' type-id='type-id-97' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
+            <var-decl name='decompose_compatibility' type-id='type-id-98' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='205' column='1'/>
           </data-member>
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='209' column='1' id='type-id-98'>
+        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='209' column='1' id='type-id-99'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='combining_class' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='211' column='1'/>
           </data-member>
@@ -1225,7 +1226,7 @@
         </class-decl>
       </member-type>
       <member-type access='public'>
-        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='215' column='1' id='type-id-99'>
+        <class-decl name='__anonymous_struct__' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='215' column='1' id='type-id-100'>
           <data-member access='public' layout-offset-in-bits='0'>
             <var-decl name='combining_class' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='217' column='1'/>
           </data-member>
@@ -1256,108 +1257,108 @@
         <var-decl name='header' type-id='type-id-49' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='65' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='parent' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='68' column='1'/>
+        <var-decl name='parent' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
         <var-decl name='immutable' type-id='type-id-7' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='70' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='func' type-id='type-id-89' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='207' column='1'/>
+        <var-decl name='func' type-id='type-id-90' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='207' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='user_data' type-id='type-id-98' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='213' column='1'/>
+        <var-decl name='user_data' type-id='type-id-99' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='213' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='destroy' type-id='type-id-99' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='219' column='1'/>
+        <var-decl name='destroy' type-id='type-id-100' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='219' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='_static_assertion_on_line_66' mangled-name='_ZNK18hb_unicode_funcs_t28_static_assertion_on_line_66Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-100' is-artificial='yes'/>
+          <parameter type-id='type-id-101' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='combining_class' mangled-name='_ZN18hb_unicode_funcs_t15combining_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-101'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-102'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='eastasian_width' mangled-name='_ZN18hb_unicode_funcs_t15eastasian_widthEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='general_category' mangled-name='_ZN18hb_unicode_funcs_t16general_categoryEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-102'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-103'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='mirroring' mangled-name='_ZN18hb_unicode_funcs_t9mirroringEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-68'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-69'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='script' mangled-name='_ZN18hb_unicode_funcs_t6scriptEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-103'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-104'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='compose' mangled-name='_ZN18hb_unicode_funcs_t7composeEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='decompose' mangled-name='_ZN18hb_unicode_funcs_t9decomposeEjPjS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='85' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-104'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-105'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='decompose_compatibility' mangled-name='_ZN18hb_unicode_funcs_t23decompose_compatibilityEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='92' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='modified_combining_class' mangled-name='_ZN18hb_unicode_funcs_t24modified_combining_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-66' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-67' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='is_variation_selector' mangled-name='_ZN18hb_unicode_funcs_t21is_variation_selectorEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public' static='yes'>
         <function-decl name='is_default_ignorable' mangled-name='_ZN18hb_unicode_funcs_t20is_default_ignorableEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <enum-decl name='hb_unicode_combining_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='87' column='1' id='type-id-101'>
+    <enum-decl name='hb_unicode_combining_class_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='87' column='1' id='type-id-102'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_UNICODE_COMBINING_CLASS_NOT_REORDERED' value='0'/>
       <enumerator name='HB_UNICODE_COMBINING_CLASS_OVERLAY' value='1'/>
@@ -1417,15 +1418,15 @@
       <enumerator name='HB_UNICODE_COMBINING_CLASS_IOTA_SUBSCRIPT' value='240'/>
       <enumerator name='HB_UNICODE_COMBINING_CLASS_INVALID' value='255'/>
     </enum-decl>
-    <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-88' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-105'/>
-    <pointer-type-def type-id='type-id-105' size-in-bits='64' id='type-id-66'/>
-    <typedef-decl name='uint32_t' type-id='type-id-10' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-106'/>
-    <typedef-decl name='hb_codepoint_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-68'/>
-    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-108'/>
-    <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-108' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-90'/>
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-110'/>
-    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-110' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-91'/>
-    <enum-decl name='hb_unicode_general_category_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='46' column='1' id='type-id-102'>
+    <typedef-decl name='hb_unicode_funcs_t' type-id='type-id-89' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='171' column='1' id='type-id-106'/>
+    <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-67'/>
+    <typedef-decl name='uint32_t' type-id='type-id-10' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-107'/>
+    <typedef-decl name='hb_codepoint_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='75' column='1' id='type-id-69'/>
+    <pointer-type-def type-id='type-id-108' size-in-bits='64' id='type-id-109'/>
+    <typedef-decl name='hb_unicode_combining_class_func_t' type-id='type-id-109' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='224' column='1' id='type-id-91'/>
+    <pointer-type-def type-id='type-id-110' size-in-bits='64' id='type-id-111'/>
+    <typedef-decl name='hb_unicode_eastasian_width_func_t' type-id='type-id-111' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='227' column='1' id='type-id-92'/>
+    <enum-decl name='hb_unicode_general_category_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='46' column='1' id='type-id-103'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_CONTROL' value='0'/>
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_FORMAT' value='1'/>
@@ -1458,11 +1459,11 @@
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR' value='28'/>
       <enumerator name='HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR' value='29'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-112'/>
-    <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-112' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-92'/>
-    <pointer-type-def type-id='type-id-113' size-in-bits='64' id='type-id-114'/>
-    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-114' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-93'/>
-    <enum-decl name='hb_script_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='157' column='1' id='type-id-103'>
+    <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-113'/>
+    <typedef-decl name='hb_unicode_general_category_func_t' type-id='type-id-113' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='230' column='1' id='type-id-93'/>
+    <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-115'/>
+    <typedef-decl name='hb_unicode_mirroring_func_t' type-id='type-id-115' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='233' column='1' id='type-id-94'/>
+    <enum-decl name='hb_script_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='157' column='1' id='type-id-104'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_SCRIPT_COMMON' value='1517910393'/>
       <enumerator name='HB_SCRIPT_INHERITED' value='1516858984'/>
@@ -1594,39 +1595,39 @@
       <enumerator name='_HB_SCRIPT_MAX_VALUE' value='4294967295'/>
       <enumerator name='_HB_SCRIPT_MAX_VALUE_SIGNED' value='2147483647'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-115' size-in-bits='64' id='type-id-116'/>
-    <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-116' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-94'/>
-    <pointer-type-def type-id='type-id-68' size-in-bits='64' id='type-id-104'/>
-    <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-118'/>
-    <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-118' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-95'/>
-    <pointer-type-def type-id='type-id-119' size-in-bits='64' id='type-id-120'/>
-    <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-120' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-121' size-in-bits='64' id='type-id-122'/>
-    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-122' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-97'/>
-    <qualified-type-def type-id='type-id-88' const='yes' id='type-id-123'/>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-100'/>
-    <enum-decl name='hb_buffer_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='174' column='1' id='type-id-67'>
+    <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-117'/>
+    <typedef-decl name='hb_unicode_script_func_t' type-id='type-id-117' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='236' column='1' id='type-id-95'/>
+    <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-105'/>
+    <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-119'/>
+    <typedef-decl name='hb_unicode_compose_func_t' type-id='type-id-119' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='242' column='1' id='type-id-96'/>
+    <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-121'/>
+    <typedef-decl name='hb_unicode_decompose_func_t' type-id='type-id-121' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='247' column='1' id='type-id-97'/>
+    <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-123'/>
+    <typedef-decl name='hb_unicode_decompose_compatibility_func_t' type-id='type-id-123' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.h' line='270' column='1' id='type-id-98'/>
+    <qualified-type-def type-id='type-id-89' const='yes' id='type-id-124'/>
+    <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-101'/>
+    <enum-decl name='hb_buffer_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='174' column='1' id='type-id-68'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_FLAG_DEFAULT' value='0'/>
       <enumerator name='HB_BUFFER_FLAG_BOT' value='1'/>
       <enumerator name='HB_BUFFER_FLAG_EOT' value='2'/>
       <enumerator name='HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES' value='4'/>
     </enum-decl>
-    <enum-decl name='hb_buffer_content_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='119' column='1' id='type-id-69'>
+    <enum-decl name='hb_buffer_content_type_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='119' column='1' id='type-id-70'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_CONTENT_TYPE_INVALID' value='0'/>
       <enumerator name='HB_BUFFER_CONTENT_TYPE_UNICODE' value='1'/>
       <enumerator name='HB_BUFFER_CONTENT_TYPE_GLYPHS' value='2'/>
     </enum-decl>
-    <class-decl name='hb_segment_properties_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='65' column='1' id='type-id-124'>
+    <class-decl name='hb_segment_properties_t' size-in-bits='256' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='65' column='1' id='type-id-125'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='direction' type-id='type-id-125' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='66' column='1'/>
+        <var-decl name='direction' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='66' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='script' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='67' column='1'/>
+        <var-decl name='script' type-id='type-id-104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='67' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='language' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='68' column='1'/>
+        <var-decl name='language' type-id='type-id-127' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='reserved1' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='70' column='1'/>
@@ -1635,7 +1636,7 @@
         <var-decl name='reserved2' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='71' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='hb_direction_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='111' column='1' id='type-id-125'>
+    <enum-decl name='hb_direction_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='111' column='1' id='type-id-126'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_DIRECTION_INVALID' value='0'/>
       <enumerator name='HB_DIRECTION_LTR' value='4'/>
@@ -1643,141 +1644,141 @@
       <enumerator name='HB_DIRECTION_TTB' value='6'/>
       <enumerator name='HB_DIRECTION_BTT' value='7'/>
     </enum-decl>
-    <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-127'>
+    <class-decl name='hb_language_impl_t' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='167' column='1' id='type-id-128'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='s' type-id='type-id-128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
+        <var-decl name='s' type-id='type-id-129' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='168' column='1'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-127' const='yes' id='type-id-129'/>
-    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-130'/>
-    <typedef-decl name='hb_language_t' type-id='type-id-130' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='137' column='1' id='type-id-126'/>
-    <typedef-decl name='hb_segment_properties_t' type-id='type-id-124' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-70'/>
-    <class-decl name='hb_glyph_info_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='44' column='1' id='type-id-131'>
+    <qualified-type-def type-id='type-id-128' const='yes' id='type-id-130'/>
+    <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-131'/>
+    <typedef-decl name='hb_language_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='137' column='1' id='type-id-127'/>
+    <typedef-decl name='hb_segment_properties_t' type-id='type-id-125' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='72' column='1' id='type-id-71'/>
+    <class-decl name='hb_glyph_info_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='44' column='1' id='type-id-132'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='codepoint' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='45' column='1'/>
+        <var-decl name='codepoint' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='46' column='1'/>
+        <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='46' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='cluster' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='47' column='1'/>
+        <var-decl name='cluster' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='47' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='var1' type-id='type-id-132' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='50' column='1'/>
+        <var-decl name='var1' type-id='type-id-133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='var2' type-id='type-id-132' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='51' column='1'/>
+        <var-decl name='var2' type-id='type-id-133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='hb_mask_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='77' column='1' id='type-id-86'/>
-    <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-133'>
+    <typedef-decl name='hb_mask_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='77' column='1' id='type-id-87'/>
+    <union-decl name='_hb_var_int_t' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='79' column='1' id='type-id-134'>
       <data-member access='private'>
-        <var-decl name='u32' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='80' column='1'/>
+        <var-decl name='u32' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='80' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='i32' type-id='type-id-134' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='81' column='1'/>
+        <var-decl name='i32' type-id='type-id-135' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='81' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='u16' type-id='type-id-135' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='82' column='1'/>
+        <var-decl name='u16' type-id='type-id-136' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='82' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='i16' type-id='type-id-136' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='83' column='1'/>
+        <var-decl name='i16' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='83' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='u8' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='84' column='1'/>
+        <var-decl name='u8' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='84' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='i8' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='85' column='1'/>
+        <var-decl name='i8' type-id='type-id-139' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='85' column='1'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='int32_t' type-id='type-id-4' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-134'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-139'/>
-    <typedef-decl name='uint16_t' type-id='type-id-139' filepath='/usr/include/stdint.h' line='50' column='1' id='type-id-140'/>
+    <typedef-decl name='int32_t' type-id='type-id-4' filepath='/usr/include/stdint.h' line='39' column='1' id='type-id-135'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-140'/>
+    <typedef-decl name='uint16_t' type-id='type-id-140' filepath='/usr/include/stdint.h' line='50' column='1' id='type-id-141'/>
 
-    <array-type-def dimensions='1' type-id='type-id-140' size-in-bits='32' id='type-id-135'>
+    <array-type-def dimensions='1' type-id='type-id-141' size-in-bits='32' id='type-id-136'>
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
-    <type-decl name='short int' size-in-bits='16' id='type-id-141'/>
-    <typedef-decl name='int16_t' type-id='type-id-141' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-142'/>
+    <type-decl name='short int' size-in-bits='16' id='type-id-142'/>
+    <typedef-decl name='int16_t' type-id='type-id-142' filepath='/usr/include/stdint.h' line='38' column='1' id='type-id-143'/>
 
-    <array-type-def dimensions='1' type-id='type-id-142' size-in-bits='32' id='type-id-136'>
+    <array-type-def dimensions='1' type-id='type-id-143' size-in-bits='32' id='type-id-137'>
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
-    <type-decl name='unsigned char' size-in-bits='8' id='type-id-143'/>
-    <typedef-decl name='uint8_t' type-id='type-id-143' filepath='/usr/include/stdint.h' line='49' column='1' id='type-id-144'/>
+    <type-decl name='unsigned char' size-in-bits='8' id='type-id-144'/>
+    <typedef-decl name='uint8_t' type-id='type-id-144' filepath='/usr/include/stdint.h' line='49' column='1' id='type-id-145'/>
 
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='32' id='type-id-137'>
-      <subrange length='4' type-id='type-id-42' id='type-id-145'/>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='32' id='type-id-138'>
+      <subrange length='4' type-id='type-id-42' id='type-id-146'/>
 
     </array-type-def>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-146'/>
-    <typedef-decl name='int8_t' type-id='type-id-146' filepath='/usr/include/stdint.h' line='37' column='1' id='type-id-147'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-147'/>
+    <typedef-decl name='int8_t' type-id='type-id-147' filepath='/usr/include/stdint.h' line='37' column='1' id='type-id-148'/>
 
-    <array-type-def dimensions='1' type-id='type-id-147' size-in-bits='32' id='type-id-138'>
-      <subrange length='4' type-id='type-id-42' id='type-id-145'/>
+    <array-type-def dimensions='1' type-id='type-id-148' size-in-bits='32' id='type-id-139'>
+      <subrange length='4' type-id='type-id-42' id='type-id-146'/>
 
     </array-type-def>
-    <typedef-decl name='hb_var_int_t' type-id='type-id-133' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-132'/>
-    <typedef-decl name='hb_glyph_info_t' type-id='type-id-131' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='52' column='1' id='type-id-81'/>
-    <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-71'/>
-    <class-decl name='hb_glyph_position_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='54' column='1' id='type-id-148'>
+    <typedef-decl name='hb_var_int_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='86' column='1' id='type-id-133'/>
+    <typedef-decl name='hb_glyph_info_t' type-id='type-id-132' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='52' column='1' id='type-id-82'/>
+    <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-72'/>
+    <class-decl name='hb_glyph_position_t' size-in-bits='160' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='54' column='1' id='type-id-149'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x_advance' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='55' column='1'/>
+        <var-decl name='x_advance' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='y_advance' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='56' column='1'/>
+        <var-decl name='y_advance' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='x_offset' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='57' column='1'/>
+        <var-decl name='x_offset' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='y_offset' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='58' column='1'/>
+        <var-decl name='y_offset' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='58' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='var' type-id='type-id-132' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='61' column='1'/>
+        <var-decl name='var' type-id='type-id-133' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='61' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='hb_position_t' type-id='type-id-134' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-149'/>
-    <typedef-decl name='hb_glyph_position_t' type-id='type-id-148' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='62' column='1' id='type-id-83'/>
-    <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-72'/>
+    <typedef-decl name='hb_position_t' type-id='type-id-135' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='76' column='1' id='type-id-150'/>
+    <typedef-decl name='hb_glyph_position_t' type-id='type-id-149' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='62' column='1' id='type-id-84'/>
+    <pointer-type-def type-id='type-id-84' size-in-bits='64' id='type-id-73'/>
 
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='64' id='type-id-73'>
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='64' id='type-id-74'>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='512' id='type-id-74'>
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+    <array-type-def dimensions='1' type-id='type-id-50' size-in-bits='512' id='type-id-75'>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-75'/>
+    <qualified-type-def type-id='type-id-10' const='yes' id='type-id-76'/>
 
 
-    <array-type-def dimensions='2' type-id='type-id-68' size-in-bits='224' id='type-id-76'>
+    <array-type-def dimensions='2' type-id='type-id-69' size-in-bits='224' id='type-id-77'>
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
-      <subrange length='5' type-id='type-id-42' id='type-id-151'/>
+      <subrange length='5' type-id='type-id-42' id='type-id-152'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-77'>
+    <array-type-def dimensions='1' type-id='type-id-10' size-in-bits='64' id='type-id-78'>
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-64' const='yes' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-78'/>
-    <reference-type-def kind='lvalue' type-id='type-id-81' size-in-bits='64' id='type-id-80'/>
-    <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-79'/>
-    <reference-type-def kind='lvalue' type-id='type-id-83' size-in-bits='64' id='type-id-82'/>
-    <qualified-type-def type-id='type-id-81' const='yes' id='type-id-153'/>
-    <reference-type-def kind='lvalue' type-id='type-id-153' size-in-bits='64' id='type-id-84'/>
-    <qualified-type-def type-id='type-id-68' const='yes' id='type-id-154'/>
-    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-85'/>
-    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-87'/>
-    <typedef-decl name='hb_buffer_t' type-id='type-id-64' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-155'/>
-    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-156'>
+    <qualified-type-def type-id='type-id-65' const='yes' id='type-id-153'/>
+    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-79'/>
+    <reference-type-def kind='lvalue' type-id='type-id-82' size-in-bits='64' id='type-id-81'/>
+    <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-80'/>
+    <reference-type-def kind='lvalue' type-id='type-id-84' size-in-bits='64' id='type-id-83'/>
+    <qualified-type-def type-id='type-id-82' const='yes' id='type-id-154'/>
+    <reference-type-def kind='lvalue' type-id='type-id-154' size-in-bits='64' id='type-id-85'/>
+    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-155'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-86'/>
+    <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-88'/>
+    <typedef-decl name='hb_buffer_t' type-id='type-id-65' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='93' column='1' id='type-id-156'/>
+    <class-decl name='hb_font_t' size-in-bits='1536' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='91' column='1' id='type-id-157'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-49' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='92' column='1'/>
       </data-member>
@@ -1785,10 +1786,10 @@
         <var-decl name='immutable' type-id='type-id-26' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='95' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='parent' type-id='type-id-157' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
+        <var-decl name='parent' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='97' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
+        <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='98' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='x_scale' type-id='type-id-4' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='100' column='1'/>
@@ -1803,7 +1804,7 @@
         <var-decl name='y_ppem' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='klass' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
+        <var-decl name='klass' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='106' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='user_data' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='107' column='1'/>
@@ -1812,158 +1813,158 @@
         <var-decl name='destroy' type-id='type-id-21' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='shaper_data' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='110' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='_static_assertion_on_line_93' mangled-name='_ZNK9hb_font_t28_static_assertion_on_line_93Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='93' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-161' is-artificial='yes'/>
+          <parameter type-id='type-id-162' is-artificial='yes'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='em_scale_x' mangled-name='_ZN9hb_font_t10em_scale_xEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-142'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-143'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='em_scale_y' mangled-name='_ZN9hb_font_t10em_scale_yEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='115' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-142'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-143'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_x_distance' mangled-name='_ZN9hb_font_t23parent_scale_x_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-149'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-150'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_y_distance' mangled-name='_ZN9hb_font_t23parent_scale_y_distanceEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='123' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-149'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-150'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_x_position' mangled-name='_ZN9hb_font_t23parent_scale_x_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-149'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-150'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_y_position' mangled-name='_ZN9hb_font_t23parent_scale_y_positionEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-149'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-150'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_distance' mangled-name='_ZN9hb_font_t21parent_scale_distanceEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='parent_scale_position' mangled-name='_ZN9hb_font_t21parent_scale_positionEPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='has_glyph' mangled-name='_ZN9hb_font_t9has_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph' mangled-name='_ZN9hb_font_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_advance' mangled-name='_ZN9hb_font_t19get_glyph_h_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='162' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_advance' mangled-name='_ZN9hb_font_t19get_glyph_v_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_origin' mangled-name='_ZN9hb_font_t18get_glyph_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_origin' mangled-name='_ZN9hb_font_t18get_glyph_v_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_h_kerning' mangled-name='_ZN9hb_font_t19get_glyph_h_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_v_kerning' mangled-name='_ZN9hb_font_t19get_glyph_v_kerningEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
-          <return type-id='type-id-149'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_extents' mangled-name='_ZN9hb_font_t17get_glyph_extentsEjP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-164'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_contour_point' mangled-name='_ZN9hb_font_t23get_glyph_contour_pointEjjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_name' mangled-name='_ZN9hb_font_t14get_glyph_nameEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='228' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <parameter type-id='type-id-61'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-26'/>
@@ -1971,97 +1972,97 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_from_name' mangled-name='_ZN9hb_font_t19get_glyph_from_nameEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <parameter type-id='type-id-50'/>
           <parameter type-id='type-id-4'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_advance_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_advance_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='guess_v_origin_minus_h_origin' mangled-name='_ZN9hb_font_t29guess_v_origin_minus_h_originEjPiS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30get_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t30add_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='subtract_glyph_origin_for_direction' mangled-name='_ZN9hb_font_t35subtract_glyph_origin_for_directionEj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_kerning_for_direction' mangled-name='_ZN9hb_font_t31get_glyph_kerning_for_directionEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='325' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_extents_for_origin' mangled-name='_ZN9hb_font_t28get_glyph_extents_for_originEj14hb_direction_tP18hb_glyph_extents_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-164'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_glyph_contour_point_for_origin' mangled-name='_ZN9hb_font_t34get_glyph_contour_point_for_originEjj14hb_direction_tPiS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-125'/>
-          <parameter type-id='type-id-162'/>
-          <parameter type-id='type-id-162'/>
+          <parameter type-id='type-id-126'/>
+          <parameter type-id='type-id-163'/>
+          <parameter type-id='type-id-163'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='glyph_to_string' mangled-name='_ZN9hb_font_t15glyph_to_stringEjPcj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-69'/>
           <parameter type-id='type-id-61'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-5'/>
@@ -2069,34 +2070,34 @@
       </member-function>
       <member-function access='public'>
         <function-decl name='glyph_from_string' mangled-name='_ZN9hb_font_t17glyph_from_stringEPKciPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='375' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
           <parameter type-id='type-id-50'/>
           <parameter type-id='type-id-4'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-26'/>
         </function-decl>
       </member-function>
       <member-function access='private'>
         <function-decl name='em_scale' mangled-name='_ZN9hb_font_t8em_scaleEsi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font-private.hh' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
-          <parameter type-id='type-id-157' is-artificial='yes'/>
-          <parameter type-id='type-id-142'/>
+          <parameter type-id='type-id-158' is-artificial='yes'/>
+          <parameter type-id='type-id-143'/>
           <parameter type-id='type-id-4'/>
-          <return type-id='type-id-149'/>
+          <return type-id='type-id-150'/>
         </function-decl>
       </member-function>
     </class-decl>
-    <typedef-decl name='hb_font_t' type-id='type-id-156' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-164'/>
-    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-157'/>
+    <typedef-decl name='hb_font_t' type-id='type-id-157' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='40' column='1' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-158'/>
     <function-decl name='hb_buffer_deserialize_glyphs' mangled-name='hb_buffer_deserialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_deserialize_glyphs'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='353' column='1'/>
       <parameter type-id='type-id-50' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='354' column='1'/>
       <parameter type-id='type-id-4' name='buf_len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='355' column='1'/>
-      <parameter type-id='type-id-62' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
-      <parameter type-id='type-id-63' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
+      <parameter type-id='type-id-63' name='end_ptr' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='356' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='357' column='1'/>
+      <parameter type-id='type-id-64' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='358' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
-    <enum-decl name='hb_buffer_serialize_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='298' column='1' id='type-id-165'>
+    <enum-decl name='hb_buffer_serialize_flags_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.h' line='298' column='1' id='type-id-166'>
       <underlying-type type-id='type-id-56'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FLAG_DEFAULT' value='0'/>
       <enumerator name='HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS' value='1'/>
@@ -2104,82 +2105,85 @@
       <enumerator name='HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES' value='4'/>
     </enum-decl>
     <function-decl name='hb_buffer_serialize_glyphs' mangled-name='hb_buffer_serialize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_glyphs'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='246' column='1'/>
       <parameter type-id='type-id-10' name='start' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='247' column='1'/>
       <parameter type-id='type-id-10' name='end' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='248' column='1'/>
       <parameter type-id='type-id-61' name='buf' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='249' column='1'/>
       <parameter type-id='type-id-10' name='buf_size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='250' column='1'/>
       <parameter type-id='type-id-60' name='buf_consumed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='251' column='1'/>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
-      <parameter type-id='type-id-63' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
-      <parameter type-id='type-id-165' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='254' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='252' column='1'/>
+      <parameter type-id='type-id-64' name='format' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='253' column='1'/>
+      <parameter type-id='type-id-166' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='254' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_buffer_serialize_format_from_string' mangled-name='hb_buffer_serialize_format_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_serialize_format_from_string'>
       <parameter type-id='type-id-50' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer-serialize.cc' line='63' column='1'/>
       <parameter type-id='type-id-4' 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-63'/>
+      <return type-id='type-id-64'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-128'/>
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-161'/>
-    <function-type size-in-bits='64' id='type-id-115'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
+    <array-type-def dimensions='1' type-id='type-id-62' size-in-bits='8' id='type-id-129'>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
+
+    </array-type-def>
+    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-162'/>
+    <function-type size-in-bits='64' id='type-id-116'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-107'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
+    <function-type size-in-bits='64' id='type-id-108'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
-      <return type-id='type-id-101'/>
+      <return type-id='type-id-102'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-111'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
+    <function-type size-in-bits='64' id='type-id-112'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
-      <return type-id='type-id-102'/>
+      <return type-id='type-id-103'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-119'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-104'/>
+    <function-type size-in-bits='64' id='type-id-120'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-117'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-104'/>
+    <function-type size-in-bits='64' id='type-id-118'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-113'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
+    <function-type size-in-bits='64' id='type-id-114'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-121'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-104'/>
+    <function-type size-in-bits='64' id='type-id-122'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-109'>
-      <parameter type-id='type-id-66'/>
-      <parameter type-id='type-id-68'/>
+    <function-type size-in-bits='64' id='type-id-110'>
+      <parameter type-id='type-id-67'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-10'/>
     </function-type>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-158'/>
     <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-159'/>
-    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-162'/>
-    <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-160'>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-160'/>
+    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-164'/>
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-163'/>
+    <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-161'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='ot' type-id='type-id-20' 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>
@@ -2187,14 +2191,10 @@
         <var-decl name='fallback' type-id='type-id-20' 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-28' size-in-bits='8' id='type-id-166'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
-
-    </array-type-def>
-    <qualified-type-def type-id='type-id-156' const='yes' id='type-id-167'/>
-    <typedef-decl name='hb_face_t' type-id='type-id-172' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-168'/>
-    <typedef-decl name='hb_font_funcs_t' type-id='type-id-173' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-169'/>
-    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-174' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-170'/>
+    <qualified-type-def type-id='type-id-157' const='yes' id='type-id-168'/>
+    <typedef-decl name='hb_face_t' type-id='type-id-172' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='44' column='1' id='type-id-169'/>
+    <typedef-decl name='hb_font_funcs_t' type-id='type-id-173' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='47' column='1' id='type-id-170'/>
+    <typedef-decl name='hb_glyph_extents_t' type-id='type-id-174' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='89' column='1' id='type-id-171'/>
     <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-172'>
       <member-type access='public'>
         <class-decl name='plan_node_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='59' column='1' id='type-id-175'>
@@ -2231,7 +2231,7 @@
         <var-decl name='num_glyphs' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='shaper_data' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='shape_plans' type-id='type-id-177' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face-private.hh' line='62' column='1'/>
@@ -2410,16 +2410,16 @@
     </class-decl>
     <class-decl name='hb_glyph_extents_t' size-in-bits='128' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='84' column='1' id='type-id-174'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x_bearing' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='85' column='1'/>
+        <var-decl name='x_bearing' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='y_bearing' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='86' column='1'/>
+        <var-decl name='y_bearing' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='width' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='87' column='1'/>
+        <var-decl name='width' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='height' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='88' column='1'/>
+        <var-decl name='height' type-id='type-id-150' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='88' column='1'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-179'/>
@@ -2438,7 +2438,7 @@
     <typedef-decl name='hb_font_get_glyph_v_kerning_func_t' type-id='type-id-204' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='117' column='1' id='type-id-188'/>
     <typedef-decl name='hb_font_get_glyph_v_origin_func_t' type-id='type-id-205' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='111' column='1' id='type-id-186'/>
     <typedef-decl name='hb_reference_table_func_t' type-id='type-id-207' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.h' line='50' column='1' id='type-id-178'/>
-    <typedef-decl name='hb_tag_t' type-id='type-id-106' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-180'/>
+    <typedef-decl name='hb_tag_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.h' line='91' column='1' id='type-id-180'/>
     <qualified-type-def type-id='type-id-172' const='yes' id='type-id-196'/>
     <qualified-type-def type-id='type-id-173' const='yes' id='type-id-197'/>
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-207'/>
@@ -2452,53 +2452,53 @@
     <typedef-decl name='hb_font_get_glyph_origin_func_t' type-id='type-id-216' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.h' line='109' column='1' id='type-id-205'/>
     <typedef-decl name='hb_shape_plan_t' type-id='type-id-217' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.h' line='39' column='1' id='type-id-198'/>
     <function-type size-in-bits='64' id='type-id-208'>
-      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-159'/>
       <parameter type-id='type-id-180'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-59'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-209'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
       <parameter type-id='type-id-50'/>
       <parameter type-id='type-id-4'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-210'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-61'/>
       <parameter type-id='type-id-10'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-211'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-164'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-212'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-105'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-213'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-10'/>
-      <parameter type-id='type-id-162'/>
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
@@ -2510,10 +2510,10 @@
         <var-decl name='default_shaper_list' type-id='type-id-26' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='40' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='face_unsafe' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
+        <var-decl name='face_unsafe' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='42' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
         <var-decl name='shaper_func' type-id='type-id-218' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='44' column='1'/>
@@ -2528,7 +2528,7 @@
         <var-decl name='num_user_features' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='shaper_data' type-id='type-id-160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
+        <var-decl name='shaper_data' type-id='type-id-161' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='50' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='_static_assertion_on_line_38' mangled-name='_ZNK15hb_shape_plan_t28_static_assertion_on_line_38Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan-private.hh' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2542,28 +2542,28 @@
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-214'/>
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-220'/>
     <function-type size-in-bits='64' id='type-id-221'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-162'/>
-      <parameter type-id='type-id-162'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-163'/>
+      <parameter type-id='type-id-163'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-26'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-222'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-223'>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-158'/>
       <parameter type-id='type-id-20'/>
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-20'/>
-      <return type-id='type-id-149'/>
+      <return type-id='type-id-150'/>
     </function-type>
     <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-219'/>
     <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-218'/>
@@ -2572,8 +2572,8 @@
     <typedef-decl name='hb_shape_func_t' type-id='type-id-228' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shaper-private.hh' line='36' column='1' id='type-id-226'/>
     <function-type size-in-bits='64' id='type-id-228'>
       <parameter type-id='type-id-176'/>
-      <parameter type-id='type-id-157'/>
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-80'/>
       <parameter type-id='type-id-229'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-26'/>
@@ -2583,7 +2583,7 @@
         <var-decl name='tag' type-id='type-id-180' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='value' type-id='type-id-106' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='45' column='1'/>
+        <var-decl name='value' type-id='type-id-107' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='45' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='start' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.h' line='46' column='1'/>
@@ -2601,7 +2601,7 @@
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIjLb1EE4nextEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-232'/>
           <parameter type-id='type-id-232'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-232'/>
         </function-decl>
@@ -2610,7 +2610,7 @@
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tIjLb1EE4prevEPKjS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='230' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-232'/>
           <parameter type-id='type-id-232'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <parameter type-id='type-id-10'/>
           <return type-id='type-id-232'/>
         </function-decl>
@@ -2622,15 +2622,15 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-233'/>
+    <qualified-type-def type-id='type-id-107' const='yes' id='type-id-233'/>
     <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-232'/>
     <class-decl name='hb_utf_t&lt;short unsigned int, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='138' column='1' id='type-id-234'>
       <member-function access='public' static='yes'>
         <function-decl name='next' mangled-name='_ZN8hb_utf_tItLb1EE4nextEPKtS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-235'/>
           <parameter type-id='type-id-235'/>
-          <parameter type-id='type-id-104'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-105'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-235'/>
         </function-decl>
       </member-function>
@@ -2638,8 +2638,8 @@
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tItLb1EE4prevEPKtS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-235'/>
           <parameter type-id='type-id-235'/>
-          <parameter type-id='type-id-104'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-105'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-235'/>
         </function-decl>
       </member-function>
@@ -2650,15 +2650,15 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-140' const='yes' id='type-id-236'/>
+    <qualified-type-def type-id='type-id-141' const='yes' id='type-id-236'/>
     <pointer-type-def type-id='type-id-236' size-in-bits='64' id='type-id-235'/>
     <class-decl name='hb_utf_t&lt;unsigned char, true&gt;' size-in-bits='8' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='39' column='1' id='type-id-237'>
       <member-function access='public' static='yes'>
         <function-decl name='next' mangled-name='_ZN8hb_utf_tIhLb1EE4nextEPKhS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-238'/>
           <parameter type-id='type-id-238'/>
-          <parameter type-id='type-id-104'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-105'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-238'/>
         </function-decl>
       </member-function>
@@ -2666,8 +2666,8 @@
         <function-decl name='prev' mangled-name='_ZN8hb_utf_tIhLb1EE4prevEPKhS2_Pjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-utf-private.hh' line='110' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-238'/>
           <parameter type-id='type-id-238'/>
-          <parameter type-id='type-id-104'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-105'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-238'/>
         </function-decl>
       </member-function>
@@ -2678,9 +2678,9 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <qualified-type-def type-id='type-id-144' const='yes' id='type-id-239'/>
+    <qualified-type-def type-id='type-id-145' const='yes' id='type-id-239'/>
     <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-238'/>
-    <qualified-type-def type-id='type-id-70' const='yes' id='type-id-240'/>
+    <qualified-type-def type-id='type-id-71' const='yes' id='type-id-240'/>
     <pointer-type-def type-id='type-id-240' size-in-bits='64' id='type-id-241'/>
     <function-decl name='hb_segment_properties_equal' mangled-name='hb_segment_properties_equal' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_segment_properties_equal'>
       <parameter type-id='type-id-241' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='40' column='1'/>
@@ -2692,123 +2692,123 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_buffer_get_empty' mangled-name='hb_buffer_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_empty'>
-      <return type-id='type-id-79'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <function-decl name='hb_buffer_set_content_type' mangled-name='hb_buffer_set_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_content_type'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
-      <parameter type-id='type-id-69' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='810' column='1'/>
+      <parameter type-id='type-id-70' name='content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='811' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_get_content_type' mangled-name='hb_buffer_get_content_type' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_content_type'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
-      <return type-id='type-id-69'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='827' column='1'/>
+      <return type-id='type-id-70'/>
     </function-decl>
     <function-decl name='hb_buffer_get_unicode_funcs' mangled-name='hb_buffer_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_unicode_funcs'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
-      <return type-id='type-id-66'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='869' column='1'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <function-decl name='hb_buffer_get_direction' mangled-name='hb_buffer_get_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_direction'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
-      <return type-id='type-id-125'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='905' column='1'/>
+      <return type-id='type-id-126'/>
     </function-decl>
     <function-decl name='hb_buffer_get_script' mangled-name='hb_buffer_get_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_script'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
-      <return type-id='type-id-103'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='940' column='1'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='hb_buffer_get_language' mangled-name='hb_buffer_get_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_language'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
-      <return type-id='type-id-126'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='975' column='1'/>
+      <return type-id='type-id-127'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-70' size-in-bits='64' id='type-id-242'/>
+    <pointer-type-def type-id='type-id-71' size-in-bits='64' id='type-id-242'/>
     <function-decl name='hb_buffer_get_segment_properties' mangled-name='hb_buffer_get_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_segment_properties'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1009' column='1'/>
       <parameter type-id='type-id-242' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1010' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_get_flags' mangled-name='hb_buffer_get_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_flags'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
-      <return type-id='type-id-67'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1046' column='1'/>
+      <return type-id='type-id-68'/>
     </function-decl>
     <function-decl name='hb_buffer_get_replacement_codepoint' mangled-name='hb_buffer_get_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_replacement_codepoint'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
-      <return type-id='type-id-68'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1082' column='1'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <function-decl name='hb_buffer_allocation_successful' mangled-name='hb_buffer_allocation_successful' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_allocation_successful'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1144' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_buffer_get_length' mangled-name='hb_buffer_get_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_length'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1219' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_buffer_get_glyph_infos' mangled-name='hb_buffer_get_glyph_infos' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_infos'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1237' column='1'/>
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1238' column='1'/>
-      <return type-id='type-id-71'/>
+      <return type-id='type-id-72'/>
     </function-decl>
     <function-decl name='hb_buffer_set_replacement_codepoint' mangled-name='hb_buffer_set_replacement_codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_replacement_codepoint'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
-      <parameter type-id='type-id-68' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1062' column='1'/>
+      <parameter type-id='type-id-69' name='replacement' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1063' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_flags' mangled-name='hb_buffer_set_flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_flags'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
-      <parameter type-id='type-id-67' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1026' column='1'/>
+      <parameter type-id='type-id-68' name='flags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1027' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_segment_properties' mangled-name='hb_buffer_set_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_segment_properties'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='990' column='1'/>
       <parameter type-id='type-id-241' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='991' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_language' mangled-name='hb_buffer_set_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_language'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
-      <parameter type-id='type-id-126' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='955' column='1'/>
+      <parameter type-id='type-id-127' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='956' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_script' mangled-name='hb_buffer_set_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_script'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='920' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='921' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_direction' mangled-name='hb_buffer_set_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_direction'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='884' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='885' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_reverse' mangled-name='hb_buffer_reverse' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_reverse_clusters' mangled-name='hb_buffer_reverse_clusters' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reverse_clusters'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_get_glyph_positions' mangled-name='hb_buffer_get_glyph_positions' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_glyph_positions'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1259' column='1'/>
       <parameter type-id='type-id-60' name='length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1260' column='1'/>
-      <return type-id='type-id-72'/>
+      <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='hb_buffer_clear_contents' mangled-name='hb_buffer_clear_contents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_clear_contents'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_unicode_funcs' mangled-name='hb_buffer_set_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_unicode_funcs'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
-      <parameter type-id='type-id-66' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='843' column='1'/>
+      <parameter type-id='type-id-67' name='unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='844' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_reset' mangled-name='hb_buffer_reset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reset'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_get_user_data' mangled-name='hb_buffer_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_get_user_data'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='793' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='794' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='hb_buffer_set_user_data' mangled-name='hb_buffer_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_user_data'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='772' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='773' column='1'/>
       <parameter type-id='type-id-20' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='774' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='775' column='1'/>
@@ -2816,41 +2816,41 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_buffer_reference' mangled-name='hb_buffer_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_reference'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
-      <return type-id='type-id-79'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='731' column='1'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <function-decl name='hb_buffer_destroy' mangled-name='hb_buffer_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_destroy'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_create' mangled-name='hb_buffer_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_create'>
-      <return type-id='type-id-79'/>
+      <return type-id='type-id-80'/>
     </function-decl>
     <function-decl name='hb_buffer_guess_segment_properties' mangled-name='hb_buffer_guess_segment_properties' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_guess_segment_properties'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_pre_allocate' mangled-name='hb_buffer_pre_allocate' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_pre_allocate'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <parameter type-id='type-id-10' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_buffer_add' mangled-name='hb_buffer_add' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
-      <parameter type-id='type-id-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1160' column='1'/>
+      <parameter type-id='type-id-69' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1161' column='1'/>
       <parameter type-id='type-id-10' name='cluster' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1162' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_add_codepoints' mangled-name='hb_buffer_add_codepoints' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_codepoints'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
-      <parameter type-id='type-id-85' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1479' column='1'/>
+      <parameter type-id='type-id-86' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1480' column='1'/>
       <parameter type-id='type-id-4' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1481' column='1'/>
       <parameter type-id='type-id-10' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1482' column='1'/>
       <parameter type-id='type-id-4' name='item_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1483' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_add_utf32' mangled-name='hb_buffer_add_utf32' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf32'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1457' column='1'/>
       <parameter type-id='type-id-232' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1458' column='1'/>
       <parameter type-id='type-id-4' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1459' column='1'/>
       <parameter type-id='type-id-10' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1460' column='1'/>
@@ -2858,7 +2858,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_add_utf16' mangled-name='hb_buffer_add_utf16' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf16'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1435' column='1'/>
       <parameter type-id='type-id-235' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1436' column='1'/>
       <parameter type-id='type-id-4' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1437' column='1'/>
       <parameter type-id='type-id-10' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1438' column='1'/>
@@ -2866,12 +2866,12 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_set_length' mangled-name='hb_buffer_set_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_set_length'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <parameter type-id='type-id-10' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1128' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_buffer_add_utf8' mangled-name='hb_buffer_add_utf8' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_add_utf8'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1413' column='1'/>
       <parameter type-id='type-id-50' name='text' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1414' column='1'/>
       <parameter type-id='type-id-4' name='text_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1415' column='1'/>
       <parameter type-id='type-id-10' name='item_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1416' column='1'/>
@@ -2879,7 +2879,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_buffer_normalize_glyphs' mangled-name='hb_buffer_normalize_glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_buffer_normalize_glyphs'>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-buffer.cc' line='1280' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -2889,7 +2889,7 @@
         <var-decl name='next' type-id='type-id-244' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='214' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lang' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='215' column='1'/>
+        <var-decl name='lang' type-id='type-id-127' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='215' column='1'/>
       </data-member>
       <member-function access='public'>
         <function-decl name='operator==' mangled-name='_ZNK18hb_language_item_teqEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -2928,16 +2928,16 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_language_to_string' mangled-name='hb_language_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_language_to_string'>
-      <parameter type-id='type-id-126' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='325' column='1'/>
+      <parameter type-id='type-id-127' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='325' column='1'/>
       <return type-id='type-id-50'/>
     </function-decl>
     <function-decl name='hb_script_to_iso15924_tag' mangled-name='hb_script_to_iso15924_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_to_iso15924_tag'>
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='429' column='1'/>
       <return type-id='type-id-180'/>
     </function-decl>
     <function-decl name='hb_script_get_horizontal_direction' mangled-name='hb_script_get_horizontal_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_get_horizontal_direction'>
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1'/>
-      <return type-id='type-id-125'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='445' column='1'/>
+      <return type-id='type-id-126'/>
     </function-decl>
     <function-decl name='hb_version' mangled-name='hb_version' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_version'>
       <parameter type-id='type-id-60' name='major' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='547' column='1'/>
@@ -2956,36 +2956,36 @@
     </function-decl>
     <function-decl name='hb_script_from_iso15924_tag' mangled-name='hb_script_from_iso15924_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_from_iso15924_tag'>
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='hb_script_from_string' mangled-name='hb_script_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_script_from_string'>
       <parameter type-id='type-id-50' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='413' column='1'/>
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='413' column='1'/>
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='hb_direction_to_string' mangled-name='hb_direction_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_direction_to_string'>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='155' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='155' column='1'/>
       <return type-id='type-id-50'/>
     </function-decl>
     <function-decl name='hb_direction_from_string' mangled-name='hb_direction_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_direction_from_string'>
       <parameter type-id='type-id-50' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='128' column='1'/>
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='128' column='1'/>
-      <return type-id='type-id-125'/>
+      <return type-id='type-id-126'/>
     </function-decl>
     <function-decl name='hb_language_from_string' mangled-name='hb_language_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_language_from_string'>
       <parameter type-id='type-id-50' name='str' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='293' column='1'/>
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='293' column='1'/>
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
     <function-decl name='hb_language_get_default' mangled-name='hb_language_get_default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='341' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_language_get_default'>
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-face.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <namespace-decl name='OT'>
       <class-decl name='BEInt&lt;unsigned int, 4&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='532' column='1' id='type-id-248'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
+          <var-decl name='v' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIjLi4EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3022,14 +3022,14 @@
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntItLi2EE3setEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-254' is-artificial='yes'/>
-            <parameter type-id='type-id-139'/>
+            <parameter type-id='type-id-140'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator short unsigned int' mangled-name='_ZNK2OT5BEIntItLi2EEcvtEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-255' is-artificial='yes'/>
-            <return type-id='type-id-139'/>
+            <return type-id='type-id-140'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -3052,22 +3052,22 @@
           <var-decl name='v' type-id='type-id-252' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeItLj2EE3setEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-258' is-artificial='yes'/>
-            <parameter type-id='type-id-139'/>
+            <parameter type-id='type-id-140'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator short unsigned int' mangled-name='_ZNK2OT7IntTypeItLj2EEcvtEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-259' is-artificial='yes'/>
-            <return type-id='type-id-139'/>
+            <return type-id='type-id-140'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -3101,7 +3101,7 @@
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeItLj2EE3cmpEt' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-259' is-artificial='yes'/>
-            <parameter type-id='type-id-139'/>
+            <parameter type-id='type-id-140'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -3124,7 +3124,7 @@
           <typedef-decl name='return_t' type-id='type-id-7' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='181' column='1' id='type-id-263'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='max_debug_depth' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='180' column='1'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='180' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='debug_depth' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='280' column='1'/>
@@ -4421,10 +4421,10 @@
       <class-decl name='OffsetTo&lt;OT::OffsetTable, OT::IntType&lt;unsigned int, 4u&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='741' column='1' id='type-id-433'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4466,10 +4466,10 @@
       <class-decl name='Offset&lt;OT::IntType&lt;unsigned int, 4u&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='683' column='1' id='type-id-434'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-438'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='is_null' mangled-name='_ZNK2OT6OffsetINS_7IntTypeIjLj4EEEE7is_nullEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4489,10 +4489,10 @@
           <var-decl name='v' type-id='type-id-248' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIjLj4EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4576,7 +4576,7 @@
           <var-decl name='tables' type-id='type-id-445' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='116' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='118' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='118' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_table_count' mangled-name='_ZNK2OT11OffsetTable15get_table_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4629,10 +4629,10 @@
       <class-decl name='Tag' 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='662' column='1' id='type-id-443'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-438'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='667' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='operator const char*' mangled-name='_ZNK2OT3TagcvPKcEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='664' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4668,10 +4668,10 @@
           <var-decl name='length' type-id='type-id-452' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='65' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='67' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT11TableRecord8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='56' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -4690,16 +4690,16 @@
       <class-decl name='CheckSum' 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='692' column='1' id='type-id-451'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-438'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='709' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='CalcTableChecksum' mangled-name='_ZN2OT8CheckSum17CalcTableChecksumEPKNS_7IntTypeIjLj4EEEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='694' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-455'/>
-            <parameter type-id='type-id-106'/>
-            <return type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
+            <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -5082,10 +5082,10 @@
           <var-decl name='numGlyphs' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='60' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='62' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_num_glyphs' mangled-name='_ZNK2OT4maxp14get_num_glyphsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-maxp-table.hh' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5115,15 +5115,15 @@
           <var-decl name='minor' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='727' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='729' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='to_int' mangled-name='_ZNK2OT12FixedVersion6to_intEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-271' is-artificial='yes'/>
-            <return type-id='type-id-106'/>
+            <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -5196,10 +5196,10 @@
           <var-decl name='glyphDataFormat' type-id='type-id-501' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='140' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='142' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_upem' mangled-name='_ZNK2OT4head8get_upemEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-head-table.hh' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5229,10 +5229,10 @@
           <var-decl name='minor' type-id='type-id-452' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='654' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='656' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12LONGDATETIME8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='648' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5253,10 +5253,10 @@
           <var-decl name='v' type-id='type-id-507' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIiLj4EE3setEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5322,7 +5322,7 @@
       </class-decl>
       <class-decl name='BEInt&lt;int, 4&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='532' column='1' id='type-id-507'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='v' type-id='type-id-137' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
+          <var-decl name='v' type-id='type-id-138' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='607' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIiLi4EE3setEi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='585' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5358,22 +5358,22 @@
           <var-decl name='v' type-id='type-id-515' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIsLj2EE3setEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-516' is-artificial='yes'/>
-            <parameter type-id='type-id-141'/>
+            <parameter type-id='type-id-142'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator short int' mangled-name='_ZNK2OT7IntTypeIsLj2EEcvsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='615' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-383' is-artificial='yes'/>
-            <return type-id='type-id-141'/>
+            <return type-id='type-id-142'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -5407,7 +5407,7 @@
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT7IntTypeIsLj2EE3cmpEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='620' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-383' is-artificial='yes'/>
-            <parameter type-id='type-id-141'/>
+            <parameter type-id='type-id-142'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -5432,14 +5432,14 @@
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT5BEIntIsLi2EE3setEs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-518' is-artificial='yes'/>
-            <parameter type-id='type-id-141'/>
+            <parameter type-id='type-id-142'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator short int' mangled-name='_ZNK2OT5BEIntIsLi2EEcvsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='543' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-519' is-artificial='yes'/>
-            <return type-id='type-id-141'/>
+            <return type-id='type-id-142'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -5466,7 +5466,7 @@
           <var-decl name='array' type-id='type-id-522' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11OffsetTableENS_7IntTypeIjLj4EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5560,7 +5560,7 @@
           <var-decl name='table' type-id='type-id-521' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='143' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='146' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='146' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_face_count' mangled-name='_ZNK2OT17TTCHeaderVersion114get_face_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5719,7 +5719,7 @@
           <var-decl name='u' type-id='type-id-543' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='254' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='256' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='256' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_tag' mangled-name='_ZNK2OT16OpenTypeFontFile7get_tagEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-file-private.hh' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5760,7 +5760,7 @@
     <pointer-type-def type-id='type-id-545' size-in-bits='64' id='type-id-250'/>
     <reference-type-def kind='lvalue' type-id='type-id-545' size-in-bits='64' id='type-id-251'/>
 
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='16' id='type-id-253'>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='16' id='type-id-253'>
       <subrange length='2' type-id='type-id-42' id='type-id-46'/>
 
     </array-type-def>
@@ -5794,7 +5794,7 @@
     <pointer-type-def type-id='type-id-554' size-in-bits='64' id='type-id-454'/>
 
     <array-type-def dimensions='1' type-id='type-id-450' size-in-bits='128' id='type-id-445'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <qualified-type-def type-id='type-id-442' const='yes' id='type-id-555'/>
@@ -5840,7 +5840,7 @@
     <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-502'/>
 
     <array-type-def dimensions='1' type-id='type-id-433' size-in-bits='32' id='type-id-522'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <qualified-type-def type-id='type-id-521' const='yes' id='type-id-566'/>
@@ -5884,42 +5884,42 @@
     <pointer-type-def type-id='type-id-572' size-in-bits='64' id='type-id-541'/>
     <pointer-type-def type-id='type-id-542' size-in-bits='64' id='type-id-544'/>
     <function-decl name='hb_face_get_empty' mangled-name='hb_face_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_empty'>
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-decl name='hb_face_is_immutable' mangled-name='hb_face_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_is_immutable'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_face_set_index' mangled-name='hb_face_set_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_index'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_face_get_index' mangled-name='hb_face_get_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_index'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_face_set_upem' mangled-name='hb_face_set_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_upem'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_face_set_glyph_count' mangled-name='hb_face_set_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_glyph_count'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='368' column='1'/>
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='369' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_face_make_immutable' mangled-name='hb_face_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_make_immutable'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_face_get_user_data' mangled-name='hb_face_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_user_data'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='284' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='285' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='hb_face_set_user_data' mangled-name='hb_face_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_set_user_data'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='263' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='264' column='1'/>
       <parameter type-id='type-id-20' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='265' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='266' column='1'/>
@@ -5927,39 +5927,39 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_face_reference' mangled-name='hb_face_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
-      <return type-id='type-id-158'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='212' column='1'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-decl name='hb_face_destroy' mangled-name='hb_face_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_destroy'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='299' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_face_create_for_tables' mangled-name='hb_face_create_for_tables' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create_for_tables'>
       <parameter type-id='type-id-178' name='reference_table_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='83' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='84' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='85' column='1'/>
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-decl name='hb_face_reference_blob' mangled-name='hb_face_reference_blob' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_blob'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='353' column='1'/>
       <return type-id='type-id-59'/>
     </function-decl>
     <function-decl name='hb_face_reference_table' mangled-name='hb_face_reference_table' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_reference_table'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='336' column='1'/>
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='337' column='1'/>
       <return type-id='type-id-59'/>
     </function-decl>
     <function-decl name='hb_face_create' mangled-name='hb_face_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_create'>
       <parameter type-id='type-id-59' name='blob' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='163' column='1'/>
       <parameter type-id='type-id-10' name='index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='164' column='1'/>
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-decl name='hb_face_get_glyph_count' mangled-name='hb_face_get_glyph_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_glyph_count'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_face_get_upem' mangled-name='hb_face_get_upem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_face_get_upem'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='388' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <reference-type-def kind='lvalue' type-id='type-id-573' size-in-bits='64' id='type-id-481'/>
@@ -6280,7 +6280,7 @@
           <var-decl name='array' type-id='type-id-817' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEES2_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6372,7 +6372,7 @@
           <var-decl name='array' type-id='type-id-820' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6OffsetINS_7IntTypeItLj2EEEEES3_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6464,7 +6464,7 @@
           <var-decl name='array' type-id='type-id-825' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6556,7 +6556,7 @@
           <var-decl name='array' type-id='type-id-829' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -6687,13 +6687,13 @@
             <member-function access='public'>
               <function-decl name='get_glyph' mangled-name='_ZN2OT8Coverage4Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='896' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-837' is-artificial='yes'/>
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_coverage' mangled-name='_ZN2OT8Coverage4Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='903' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-837' is-artificial='yes'/>
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -6715,12 +6715,12 @@
           <var-decl name='u' type-id='type-id-839' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='get_coverage' mangled-name='_ZNK2OT8Coverage12get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='808' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-840' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -6809,13 +6809,13 @@
             <member-function access='public'>
               <function-decl name='get_glyph' mangled-name='_ZN2OT15CoverageFormat14Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='676' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-845' is-artificial='yes'/>
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_coverage' mangled-name='_ZN2OT15CoverageFormat14Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='677' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-845' is-artificial='yes'/>
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -6827,12 +6827,12 @@
           <var-decl name='glyphArray' type-id='type-id-626' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='688' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='690' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='690' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat112get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='633' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-844' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -6926,13 +6926,13 @@
             <member-function access='public'>
               <function-decl name='get_glyph' mangled-name='_ZN2OT15CoverageFormat24Iter9get_glyphEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='787' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-848' is-artificial='yes'/>
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='get_coverage' mangled-name='_ZN2OT15CoverageFormat24Iter12get_coverageEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-848' is-artificial='yes'/>
-                <return type-id='type-id-140'/>
+                <return type-id='type-id-141'/>
               </function-decl>
             </member-function>
           </class-decl>
@@ -6944,12 +6944,12 @@
           <var-decl name='rangeRecord' type-id='type-id-627' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='799' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='803' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='803' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='get_coverage' mangled-name='_ZNK2OT15CoverageFormat212get_coverageEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='698' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-847' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -7014,7 +7014,7 @@
           <var-decl name='array' type-id='type-id-817' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='975' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator[]' mangled-name='_ZNK2OT15HeadlessArrayOfINS_7IntTypeItLj2EEES2_EixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='928' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7075,7 +7075,7 @@
           <var-decl name='component' type-id='type-id-580' 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'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='701' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='701' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT8Ligature7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='602' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7142,7 +7142,7 @@
           <var-decl name='ligature' type-id='type-id-856' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT11LigatureSet7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='706' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7216,7 +7216,7 @@
           <var-decl name='ligatureSet' type-id='type-id-859' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT20LigatureSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7301,7 +7301,7 @@
           <var-decl name='markFilteringSetX' type-id='type-id-861' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_subtable_count' mangled-name='_ZNK2OT6Lookup18get_subtable_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='562' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7318,7 +7318,7 @@
         <member-function access='public'>
           <function-decl name='get_props' mangled-name='_ZNK2OT6Lookup9get_propsEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='569' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-378' is-artificial='yes'/>
-            <return type-id='type-id-106'/>
+            <return type-id='type-id-107'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -7326,7 +7326,7 @@
             <parameter type-id='type-id-464' is-artificial='yes'/>
             <parameter type-id='type-id-436'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <parameter type-id='type-id-10'/>
             <return type-id='type-id-7'/>
           </function-decl>
@@ -7356,10 +7356,10 @@
       <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-585'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6AnchorENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7403,10 +7403,10 @@
       <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-586'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7459,10 +7459,10 @@
       <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-587'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7ArrayOfINS_7IntTypeItLj2EEES3_EES3_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7506,10 +7506,10 @@
       <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-588'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10AttachListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7553,10 +7553,10 @@
       <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-589'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7600,10 +7600,10 @@
       <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-590'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7647,10 +7647,10 @@
       <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-591'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7694,10 +7694,10 @@
       <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-592'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8ClassDefENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7741,10 +7741,10 @@
       <class-decl name='OffsetTo&lt;OT::CmapSubtable, OT::IntType&lt;unsigned int, 4u&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='741' column='1' id='type-id-593'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12CmapSubtableENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7788,10 +7788,10 @@
       <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-594'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7835,10 +7835,10 @@
       <class-decl name='OffsetTo&lt;OT::Coverage, OT::IntType&lt;unsigned int, 4u&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='741' column='1' id='type-id-595'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7882,10 +7882,10 @@
       <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-596'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6DeviceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7929,10 +7929,10 @@
       <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-597'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7FeatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7985,10 +7985,10 @@
       <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-598'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13FeatureParamsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8041,10 +8041,10 @@
       <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-599'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7LangSysENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8097,10 +8097,10 @@
       <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-600'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12LigCaretListENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8144,10 +8144,10 @@
       <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-601'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8191,10 +8191,10 @@
       <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-602'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8LigatureENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8238,10 +8238,10 @@
       <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-603'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11LigatureSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8285,10 +8285,10 @@
       <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-604'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8332,10 +8332,10 @@
       <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-605'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9MarkArrayENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8379,10 +8379,10 @@
       <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-606'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13MarkGlyphSetsENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8426,10 +8426,10 @@
       <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-607'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_12AnchorMatrixEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8482,10 +8482,10 @@
       <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-608'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_6LookupEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8529,10 +8529,10 @@
       <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-609'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_9PosLookupEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8576,10 +8576,10 @@
       <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-610'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12OffsetListOfINS_11SubstLookupEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8623,10 +8623,10 @@
       <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-611'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8679,10 +8679,10 @@
       <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-612'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8726,10 +8726,10 @@
       <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-613'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8782,10 +8782,10 @@
       <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-614'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_7FeatureEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8829,10 +8829,10 @@
       <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-615'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_12RecordListOfINS_6ScriptEEENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8876,10 +8876,10 @@
       <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-616'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8923,10 +8923,10 @@
       <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-617'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -8970,10 +8970,10 @@
       <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-618'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_6ScriptENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9026,10 +9026,10 @@
       <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-619'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9073,10 +9073,10 @@
       <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UVSMapping, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&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='741' column='1' id='type-id-620'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13SortedArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEEES4_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9120,10 +9120,10 @@
       <class-decl name='OffsetTo&lt;OT::SortedArrayOf&lt;OT::UnicodeValueRange, OT::IntType&lt;unsigned int, 4u&gt; &gt;, OT::IntType&lt;unsigned int, 4u&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='741' column='1' id='type-id-621'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-434'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_13SortedArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEEES4_EclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9167,10 +9167,10 @@
       <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-622'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9214,10 +9214,10 @@
       <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-623'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-862'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='778' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='operator()' mangled-name='_ZNK2OT8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEclEPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='742' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9278,10 +9278,10 @@
           <var-decl name='deltaGlyphID' type-id='type-id-501' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='110' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='113' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9354,7 +9354,7 @@
           <var-decl name='substitute' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='187' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='190' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='190' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT18SingleSubstFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9515,7 +9515,7 @@
           <function-decl name='serialize_single' mangled-name='_ZN2OT11SubstLookup16serialize_singleEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEES7_j' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1220' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-436'/>
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <parameter type-id='type-id-819'/>
             <parameter type-id='type-id-819'/>
             <parameter type-id='type-id-10'/>
@@ -9526,7 +9526,7 @@
           <function-decl name='serialize_multiple' mangled-name='_ZN2OT11SubstLookup18serialize_multipleEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1231' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-436'/>
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <parameter type-id='type-id-819'/>
             <parameter type-id='type-id-858'/>
             <parameter type-id='type-id-10'/>
@@ -9538,7 +9538,7 @@
           <function-decl name='serialize_alternate' mangled-name='_ZN2OT11SubstLookup19serialize_alternateEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1244' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-436'/>
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <parameter type-id='type-id-819'/>
             <parameter type-id='type-id-858'/>
             <parameter type-id='type-id-10'/>
@@ -9550,7 +9550,7 @@
           <function-decl name='serialize_ligature' mangled-name='_ZN2OT11SubstLookup18serialize_ligatureEPNS_22hb_serialize_context_tEjRNS_8SupplierINS_7IntTypeItLj2EEEEERNS3_IjEEjS7_S9_S7_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1257' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-463' is-artificial='yes'/>
             <parameter type-id='type-id-436'/>
-            <parameter type-id='type-id-106'/>
+            <parameter type-id='type-id-107'/>
             <parameter type-id='type-id-819'/>
             <parameter type-id='type-id-858'/>
             <parameter type-id='type-id-10'/>
@@ -9675,7 +9675,7 @@
           <var-decl name='u' type-id='type-id-949' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sanitize' mangled-name='_ZN2OT19SubstLookupSubTable8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1117' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -9734,7 +9734,7 @@
       </class-decl>
     </namespace-decl>
     <array-type-def dimensions='1' type-id='type-id-257' size-in-bits='16' id='type-id-817'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-962' size-in-bits='64' id='type-id-864'/>
@@ -9789,19 +9789,19 @@
     <pointer-type-def type-id='type-id-997' size-in-bits='64' id='type-id-960'/>
     <pointer-type-def type-id='type-id-998' size-in-bits='64' id='type-id-854'/>
     <array-type-def dimensions='1' type-id='type-id-862' size-in-bits='16' id='type-id-820'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-602' size-in-bits='16' id='type-id-825'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-603' size-in-bits='16' id='type-id-829'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-444' size-in-bits='16' id='type-id-861'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-999' size-in-bits='64' id='type-id-863'/>
@@ -9863,7 +9863,7 @@
     <pointer-type-def type-id='type-id-1039' size-in-bits='64' id='type-id-942'/>
     <reference-type-def kind='lvalue' type-id='type-id-1040' size-in-bits='64' id='type-id-935'/>
     <pointer-type-def type-id='type-id-1040' size-in-bits='64' id='type-id-959'/>
-    <reference-type-def kind='lvalue' type-id='type-id-154' size-in-bits='64' id='type-id-940'/>
+    <reference-type-def kind='lvalue' type-id='type-id-155' size-in-bits='64' id='type-id-940'/>
     <pointer-type-def type-id='type-id-1041' size-in-bits='64' id='type-id-945'/>
     <pointer-type-def type-id='type-id-1042' size-in-bits='64' id='type-id-841'/>
     <pointer-type-def type-id='type-id-1043' size-in-bits='64' id='type-id-843'/>
@@ -9950,18 +9950,18 @@
           <var-decl name='yCoordinate' type-id='type-id-501' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='236' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat110get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-412' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -9995,18 +9995,18 @@
           <var-decl name='anchorPoint' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='266' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat210get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-413' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -10043,18 +10043,18 @@
           <var-decl name='yDeviceTable' type-id='type-id-596' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='299' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='303' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT13AnchorFormat310get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-414' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -10082,7 +10082,7 @@
           <var-decl name='matrixZ' type-id='type-id-1052' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT12AnchorMatrix10get_anchorEjjjPb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10125,7 +10125,7 @@
           <var-decl name='array' type-id='type-id-1055' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_21CmapSubtableLongGroupENS_7IntTypeIjLj4EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10217,7 +10217,7 @@
           <var-decl name='array' type-id='type-id-1061' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_14EncodingRecordENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10316,7 +10316,7 @@
           <var-decl name='array' type-id='type-id-1066' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_15EntryExitRecordENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10408,7 +10408,7 @@
           <var-decl name='array' type-id='type-id-1072' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_5IndexENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10500,7 +10500,7 @@
           <var-decl name='array' type-id='type-id-817' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeItLj2EEENS1_IjLj4EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10592,7 +10592,7 @@
           <var-decl name='array' type-id='type-id-1079' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_7IntTypeIjLj3EEENS1_ItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10684,7 +10684,7 @@
           <var-decl name='array' type-id='type-id-1085' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_12LookupRecordENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10776,7 +10776,7 @@
           <var-decl name='array' type-id='type-id-1091' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_10MarkRecordENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10868,7 +10868,7 @@
           <var-decl name='array' type-id='type-id-1096' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_12AnchorMatrixENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -10969,7 +10969,7 @@
           <var-decl name='array' type-id='type-id-1101' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS0_INS_7IntTypeItLj2EEES3_EES3_EES3_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11061,7 +11061,7 @@
           <var-decl name='array' type-id='type-id-1106' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_10CaretValueENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11153,7 +11153,7 @@
           <var-decl name='array' type-id='type-id-1111' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_9ChainRuleENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11245,7 +11245,7 @@
           <var-decl name='array' type-id='type-id-1116' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_12ChainRuleSetENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11337,7 +11337,7 @@
           <var-decl name='array' type-id='type-id-1121' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11429,7 +11429,7 @@
           <var-decl name='array' type-id='type-id-1126' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8CoverageENS_7IntTypeIjLj4EEEEENS3_ItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11521,7 +11521,7 @@
           <var-decl name='array' type-id='type-id-1131' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8LigGlyphENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11613,7 +11613,7 @@
           <var-decl name='array' type-id='type-id-1136' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_6LookupENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11705,7 +11705,7 @@
           <var-decl name='array' type-id='type-id-1141' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7PairSetENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11806,7 +11806,7 @@
           <var-decl name='array' type-id='type-id-1146' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_9PosLookupENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11898,7 +11898,7 @@
           <var-decl name='array' type-id='type-id-1151' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_17PosLookupSubTableENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -11999,7 +11999,7 @@
           <var-decl name='array' type-id='type-id-1156' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_4RuleENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12091,7 +12091,7 @@
           <var-decl name='array' type-id='type-id-1161' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_7RuleSetENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12183,7 +12183,7 @@
           <var-decl name='array' type-id='type-id-1166' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_8SequenceENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12275,7 +12275,7 @@
           <var-decl name='array' type-id='type-id-1171' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_11SubstLookupENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12367,7 +12367,7 @@
           <var-decl name='array' type-id='type-id-1176' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_8OffsetToINS_19SubstLookupSubTableENS_7IntTypeItLj2EEEEES4_E9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12468,7 +12468,7 @@
           <var-decl name='array' type-id='type-id-1181' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_11RangeRecordENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12560,7 +12560,7 @@
           <var-decl name='array' type-id='type-id-1187' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7FeatureEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12652,7 +12652,7 @@
           <var-decl name='array' type-id='type-id-1192' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_7LangSysEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12744,7 +12744,7 @@
           <var-decl name='array' type-id='type-id-1197' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_6RecordINS_6ScriptEEENS_7IntTypeItLj2EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12836,7 +12836,7 @@
           <var-decl name='array' type-id='type-id-1202' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_10UVSMappingENS_7IntTypeIjLj4EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -12928,7 +12928,7 @@
           <var-decl name='array' type-id='type-id-1208' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_17UnicodeValueRangeENS_7IntTypeIjLj4EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13020,7 +13020,7 @@
           <var-decl name='array' type-id='type-id-1214' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='895' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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='sub_array' mangled-name='_ZNK2OT7ArrayOfINS_23VariationSelectorRecordENS_7IntTypeIjLj4EEEE9sub_arrayEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='794' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13112,18 +13112,18 @@
           <var-decl name='coordinate' type-id='type-id-501' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='111' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='private'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat115get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='99' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-343' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
-            <return type-id='type-id-149'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -13150,18 +13150,18 @@
           <var-decl name='caretValuePoint' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='137' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='private'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat215get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='121' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-344' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
-            <return type-id='type-id-149'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -13191,18 +13191,18 @@
           <var-decl name='deviceTable' type-id='type-id-596' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='162' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='166' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT17CaretValueFormat315get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='146' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-347' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
-            <return type-id='type-id-149'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -13237,12 +13237,12 @@
           <var-decl name='classValue' type-id='type-id-573' 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'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='986' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='986' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat19get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='939' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-351' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -13298,16 +13298,16 @@
           <var-decl name='glyphIdArray' type-id='type-id-1224' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='66' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableFormat09get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-278' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -13338,14 +13338,14 @@
           <var-decl name='record' type-id='type-id-1226' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='389' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph_variant' mangled-name='_ZNK2OT20CmapSubtableFormat1417get_glyph_variantEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='369' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-295' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-1227'/>
           </function-decl>
         </member-function>
@@ -13397,13 +13397,13 @@
           <var-decl name='values' type-id='type-id-861' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='171' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableFormat49get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-279' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -13446,13 +13446,13 @@
           <var-decl name='groups' type-id='type-id-1230' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat12EE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-287' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -13495,13 +13495,13 @@
           <var-decl name='groups' type-id='type-id-1230' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='258' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT25CmapSubtableLongSegmentedINS_20CmapSubtableFormat13EE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-288' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -13544,13 +13544,13 @@
           <var-decl name='glyphIdArray' type-id='type-id-573' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableTrimmedINS_7IntTypeItLj2EEEE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-283' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -13593,13 +13593,13 @@
           <var-decl name='glyphIdArray' type-id='type-id-754' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='227' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT19CmapSubtableTrimmedINS_7IntTypeIjLj4EEEE9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-285' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -13642,7 +13642,7 @@
           <var-decl name='lookupRecordX' type-id='type-id-1085' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1432' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13719,20 +13719,20 @@
           <var-decl name='deltaValue' type-id='type-id-861' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_x_delta' mangled-name='_ZNK2OT6Device11get_x_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1103' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-345' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <return type-id='type-id-149'/>
+            <parameter type-id='type-id-158'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_y_delta' mangled-name='_ZNK2OT6Device11get_y_deltaEP9hb_font_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1106' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-345' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <return type-id='type-id-149'/>
+            <parameter type-id='type-id-158'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -13789,10 +13789,10 @@
           <var-decl name='subtable' type-id='type-id-593' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='473' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='475' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='475' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT14EncodingRecord3cmpERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13829,10 +13829,10 @@
           <var-decl name='extensionOffset' type-id='type-id-452' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2191' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2194' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_type' mangled-name='_ZNK2OT16ExtensionFormat18get_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2178' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13881,7 +13881,7 @@
           <var-decl name='lookupIndex' type-id='type-id-1242' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_lookup_count' mangled-name='_ZNK2OT7Feature16get_lookup_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13957,7 +13957,7 @@
           <var-decl name='characters' type-id='type-id-755' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT30FeatureParamsCharacterVariants8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='407' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -13998,10 +13998,10 @@
           <var-decl name='rangeEnd' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='364' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17FeatureParamsSize8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14027,10 +14027,10 @@
           <var-decl name='uiNameID' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='386' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT25FeatureParamsStylisticSet8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='374' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14059,7 +14059,7 @@
           <var-decl name='featureIndex' type-id='type-id-1242' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_feature_count' mangled-name='_ZNK2OT7LangSys17get_feature_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14210,10 +14210,10 @@
           <var-decl name='baseArray' type-id='type-id-586' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1080' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkBasePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1023' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14271,10 +14271,10 @@
           <var-decl name='ligatureArray' type-id='type-id-607' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1201' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17MarkLigPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1127' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14332,10 +14332,10 @@
           <var-decl name='mark2Array' type-id='type-id-586' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1320' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT18MarkMarkPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1243' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14381,10 +14381,10 @@
           <var-decl name='markAnchor' type-id='type-id-585' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='385' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT10MarkRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='377' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14476,10 +14476,10 @@
       <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-862'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='686' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='is_null' mangled-name='_ZNK2OT6OffsetINS_7IntTypeItLj2EEEE7is_nullEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='684' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14523,7 +14523,7 @@
           <var-decl name='pairSet' type-id='type-id-1260' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='655' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14596,7 +14596,7 @@
           <var-decl name='values' type-id='type-id-1262' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT14PairPosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='719' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14664,7 +14664,7 @@
           <var-decl name='arrayZ' type-id='type-id-861' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT7PairSet14collect_glyphsEPNS_27hb_collect_glyphs_context_tEPKNS_11ValueFormatE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='578' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14717,10 +14717,10 @@
           <var-decl name='offset' type-id='type-id-597' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_7FeatureEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14757,10 +14757,10 @@
           <var-decl name='offset' type-id='type-id-599' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_7LangSysEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14797,10 +14797,10 @@
           <var-decl name='offset' 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='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT6RecordINS_6ScriptEE3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14899,7 +14899,7 @@
           <var-decl name='values' type-id='type-id-1262' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='435' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -14960,7 +14960,7 @@
           <var-decl name='values' type-id='type-id-1262' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT16SinglePosFormat214collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='481' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15087,16 +15087,16 @@
           <var-decl name='nonDefaultUVS' type-id='type-id-620' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='362' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='364' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='364' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT23VariationSelectorRecord9get_glyphEjPjPKv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='327' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-294' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-20'/>
             <return type-id='type-id-1227'/>
           </function-decl>
@@ -15187,10 +15187,10 @@
           <var-decl name='numberOfLongMetrics' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='85' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='88' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='88' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4_hea8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hhea-table.hh' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15219,7 +15219,7 @@
           <var-decl name='encodingRecord' type-id='type-id-1288' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='510' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='find_subtable' mangled-name='_ZNK2OT4cmap13find_subtableEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='482' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15293,31 +15293,31 @@
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1294' size-in-bits='96' id='type-id-1055'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-795' size-in-bits='64' id='type-id-1061'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1295' size-in-bits='32' id='type-id-1066'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1296' size-in-bits='16' id='type-id-1072'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1297' size-in-bits='24' id='type-id-1079'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1298' size-in-bits='32' id='type-id-1085'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-805' size-in-bits='32' id='type-id-1091'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-953' size-in-bits='64' id='type-id-1047'/>
@@ -15460,103 +15460,103 @@
     <pointer-type-def type-id='type-id-815' size-in-bits='64' id='type-id-1287'/>
     <pointer-type-def type-id='type-id-816' size-in-bits='64' id='type-id-1290'/>
     <array-type-def dimensions='1' type-id='type-id-585' size-in-bits='16' id='type-id-1052'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-586' size-in-bits='16' id='type-id-1096'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-587' size-in-bits='16' id='type-id-1101'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-589' size-in-bits='16' id='type-id-1106'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-590' size-in-bits='16' id='type-id-1111'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-591' size-in-bits='16' id='type-id-1116'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-594' size-in-bits='16' id='type-id-1121'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-595' size-in-bits='32' id='type-id-1126'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-601' size-in-bits='16' id='type-id-1131'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-604' size-in-bits='16' id='type-id-1136'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-611' size-in-bits='16' id='type-id-1141'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-612' size-in-bits='16' id='type-id-1146'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-613' size-in-bits='16' id='type-id-1151'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-616' size-in-bits='16' id='type-id-1156'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-617' size-in-bits='16' id='type-id-1161'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-619' size-in-bits='16' id='type-id-1166'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-622' size-in-bits='16' id='type-id-1171'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-623' size-in-bits='16' id='type-id-1176'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1299' size-in-bits='48' id='type-id-1181'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-809' size-in-bits='48' id='type-id-1187'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-810' size-in-bits='48' id='type-id-1192'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-811' size-in-bits='48' id='type-id-1197'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1331' size-in-bits='40' id='type-id-1202'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-1332' size-in-bits='32' id='type-id-1208'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <array-type-def dimensions='1' type-id='type-id-814' size-in-bits='88' id='type-id-1214'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-7' size-in-bits='64' id='type-id-1053'/>
@@ -15672,7 +15672,7 @@
           <var-decl name='alternateSet' type-id='type-id-1349' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT21AlternateSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='454' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -15762,15 +15762,15 @@
           <var-decl name='u' type-id='type-id-1352' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='337' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='339' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='339' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_anchor' mangled-name='_ZNK2OT6Anchor10get_anchorEP9hb_font_tjPiS3_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1353' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-162'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-163'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -15798,12 +15798,12 @@
           <var-decl name='attachPoint' type-id='type-id-1349' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT10AttachList17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1355' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
@@ -15853,15 +15853,15 @@
           <var-decl name='u' type-id='type-id-1357' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='198' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='200' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='200' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_caret_value' mangled-name='_ZNK2OT10CaretValue15get_caret_valueEP9hb_font_t14hb_direction_tj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1358' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
-            <return type-id='type-id-149'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
+            <return type-id='type-id-150'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -15959,7 +15959,7 @@
           <var-decl name='lookupX' type-id='type-id-756' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT9ChainRule7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1675' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16014,7 +16014,7 @@
           <var-decl name='rule' type-id='type-id-1371' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1805' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1808' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1808' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT12ChainRuleSet7closureEPNS_20hb_closure_context_tERNS_32ChainContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1760' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16088,12 +16088,12 @@
           <var-decl name='u' type-id='type-id-1374' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1090' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_class' mangled-name='_ZNK2OT8ClassDef9get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1050' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1376' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -16162,22 +16162,22 @@
           <var-decl name='u' type-id='type-id-1378' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='446' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='448' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_glyph' mangled-name='_ZNK2OT12CmapSubtable9get_glyphEjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='396' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1289' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='get_glyph_variant' mangled-name='_ZNK2OT12CmapSubtable17get_glyph_variantEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='411' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1289' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-68'/>
-            <parameter type-id='type-id-104'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-69'/>
+            <parameter type-id='type-id-105'/>
             <return type-id='type-id-1227'/>
           </function-decl>
         </member-function>
@@ -16364,10 +16364,10 @@
           <var-decl name='u' type-id='type-id-1392' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='470' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
         </data-member>
         <data-member access='private' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='471' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT13FeatureParams8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='447' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16415,17 +16415,17 @@
           <var-decl name='ligGlyph' type-id='type-id-1397' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='266' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='269' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='269' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT12LigCaretList14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='238' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1398' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -16456,17 +16456,17 @@
           <var-decl name='carets' type-id='type-id-1400' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='229' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='233' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='233' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT8LigGlyph14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1401' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -16531,13 +16531,13 @@
           <var-decl name='u' type-id='type-id-1405' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='315' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='317' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='317' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='covers' mangled-name='_ZNK2OT13MarkGlyphSets6coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1407' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -16568,7 +16568,7 @@
           <var-decl name='sequence' type-id='type-id-1409' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT20MultipleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16853,7 +16853,7 @@
           <var-decl name='u' type-id='type-id-1427' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1437' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1439' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1439' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT17PosLookupSubTable8sanitizeEPNS_21hb_sanitize_context_tEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1405' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -16951,7 +16951,7 @@
           <var-decl name='substituteX' type-id='type-id-573' 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'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT30ReverseChainSingleSubstFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='930' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17017,7 +17017,7 @@
           <var-decl name='lookupRecordX' type-id='type-id-1085' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT4Rule7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1136' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17078,7 +17078,7 @@
           <var-decl name='rule' type-id='type-id-1454' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1242' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1245' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1245' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT7RuleSet7closureEPNS_20hb_closure_context_tERNS_27ContextClosureLookupContextE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1195' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17142,7 +17142,7 @@
           <var-decl name='langSys' type-id='type-id-1457' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='251' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='get_lang_sys_count' mangled-name='_ZNK2OT6Script18get_lang_sys_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17221,7 +17221,7 @@
           <var-decl name='substitute' type-id='type-id-573' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='322' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT8Sequence7closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -17402,7 +17402,7 @@
           <function-decl name='operator[]' mangled-name='_ZNK2OT8SupplierIjEixEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='493' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1473' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <return type-id='type-id-75'/>
+            <return type-id='type-id-76'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
@@ -17462,11 +17462,11 @@
         <member-function access='public'>
           <function-decl name='apply_value' mangled-name='_ZNK2OT11ValueFormat11apply_valueEP9hb_font_t14hb_direction_tPKvPKNS_7IntTypeItLj2EEER19hb_glyph_position_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='97' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1265' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
             <parameter type-id='type-id-20'/>
             <parameter type-id='type-id-1476'/>
-            <parameter type-id='type-id-82'/>
+            <parameter type-id='type-id-83'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -17568,10 +17568,10 @@
               <var-decl name='ignore_zwj' type-id='type-id-7' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='386' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='64'>
-              <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='387' column='1'/>
+              <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='387' column='1'/>
             </data-member>
             <data-member access='protected' layout-offset-in-bits='96'>
-              <var-decl name='syllable' 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='388' column='1'/>
+              <var-decl name='syllable' type-id='type-id-145' 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-1484' 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'/>
@@ -17609,14 +17609,14 @@
             <member-function access='public'>
               <function-decl name='set_mask' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t8set_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1486' is-artificial='yes'/>
-                <parameter type-id='type-id-86'/>
+                <parameter type-id='type-id-87'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='set_syllable' mangled-name='_ZN2OT18hb_apply_context_t9matcher_t12set_syllableEh' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1486' is-artificial='yes'/>
-                <parameter type-id='type-id-144'/>
+                <parameter type-id='type-id-145'/>
                 <return type-id='type-id-5'/>
               </function-decl>
             </member-function>
@@ -17631,7 +17631,7 @@
             <member-function access='public'>
               <function-decl name='may_match' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t9may_matchERK15hb_glyph_info_tPKNS_7IntTypeItLj2EEE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1487' is-artificial='yes'/>
-                <parameter type-id='type-id-84'/>
+                <parameter type-id='type-id-85'/>
                 <parameter type-id='type-id-1488'/>
                 <return type-id='type-id-1482'/>
               </function-decl>
@@ -17640,7 +17640,7 @@
               <function-decl name='may_skip' mangled-name='_ZNK2OT18hb_apply_context_t9matcher_t8may_skipEPKS0_RK15hb_glyph_info_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='368' column='1' visibility='default' binding='global' size-in-bits='64'>
                 <parameter type-id='type-id-1487' is-artificial='yes'/>
                 <parameter type-id='type-id-1489'/>
-                <parameter type-id='type-id-84'/>
+                <parameter type-id='type-id-85'/>
                 <return type-id='type-id-1483'/>
               </function-decl>
             </member-function>
@@ -17796,25 +17796,25 @@
           <typedef-decl name='recurse_func_t' type-id='type-id-1497' 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-1496'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='table_index' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='282' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='font' type-id='type-id-157' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
+          <var-decl name='font' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='283' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
+          <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='284' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='buffer' type-id='type-id-79' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
+          <var-decl name='buffer' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='285' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='direction' type-id='type-id-125' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='286' column='1'/>
+          <var-decl name='direction' type-id='type-id-126' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='286' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='288'>
-          <var-decl name='lookup_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='287' column='1'/>
+          <var-decl name='lookup_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='287' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='auto_zwj' type-id='type-id-7' 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'/>
@@ -17866,15 +17866,15 @@
           <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-855' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-80'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='set_lookup_mask' mangled-name='_ZN2OT18hb_apply_context_t15set_lookup_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='312' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-855' is-artificial='yes'/>
-            <parameter type-id='type-id-86'/>
+            <parameter type-id='type-id-87'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -17909,7 +17909,7 @@
         <member-function access='public'>
           <function-decl name='match_properties_mark' mangled-name='_ZNK2OT18hb_apply_context_t21match_properties_markEjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-10'/>
             <return type-id='type-id-7'/>
@@ -17926,7 +17926,7 @@
         <member-function access='public'>
           <function-decl name='_set_glyph_props' mangled-name='_ZNK2OT18hb_apply_context_t16_set_glyph_propsEjjbb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='573' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-7'/>
             <parameter type-id='type-id-7'/>
@@ -17936,21 +17936,21 @@
         <member-function access='public'>
           <function-decl name='replace_glyph' mangled-name='_ZNK2OT18hb_apply_context_t13replace_glyphEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='replace_glyph_inplace' mangled-name='_ZNK2OT18hb_apply_context_t21replace_glyph_inplaceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='replace_glyph_with_ligature' mangled-name='_ZNK2OT18hb_apply_context_t27replace_glyph_with_ligatureEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -17958,7 +17958,7 @@
         <member-function access='public'>
           <function-decl name='output_glyph_for_component' mangled-name='_ZNK2OT18hb_apply_context_t26output_glyph_for_componentEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='616' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1489' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <return type-id='type-id-5'/>
           </function-decl>
@@ -18114,10 +18114,10 @@
           <typedef-decl name='recurse_func_t' type-id='type-id-1521' 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-1520'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='face' type-id='type-id-158' 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'/>
+          <var-decl name='face' type-id='type-id-159' 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-842' 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'/>
@@ -18159,7 +18159,7 @@
         <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-852' is-artificial='yes'/>
-            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-159'/>
             <parameter type-id='type-id-842'/>
             <parameter type-id='type-id-10'/>
             <return type-id='type-id-5'/>
@@ -18267,10 +18267,10 @@
           <typedef-decl name='recurse_func_t' type-id='type-id-1524' 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-1523'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='face' type-id='type-id-158' 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'/>
+          <var-decl name='face' type-id='type-id-159' 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-842' 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'/>
@@ -18324,7 +18324,7 @@
         <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-853' is-artificial='yes'/>
-            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-159'/>
             <parameter type-id='type-id-842'/>
             <parameter type-id='type-id-842'/>
             <parameter type-id='type-id-842'/>
@@ -18495,7 +18495,7 @@
           <typedef-decl name='return_t' type-id='type-id-838' 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-961'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='debug_depth' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='247' column='1'/>
@@ -18665,13 +18665,13 @@
           <typedef-decl name='return_t' type-id='type-id-7' 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-946'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='max_debug_depth' type-id='type-id-75' 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'/>
+          <var-decl name='max_debug_depth' type-id='type-id-76' 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'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
+          <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='115' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='glyphs' type-id='type-id-85' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='116' column='1'/>
+          <var-decl name='glyphs' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='116' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='len' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='117' column='1'/>
@@ -18703,8 +18703,8 @@
         <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-854' is-artificial='yes'/>
-            <parameter type-id='type-id-158'/>
-            <parameter type-id='type-id-85'/>
+            <parameter type-id='type-id-159'/>
+            <parameter type-id='type-id-86'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-7'/>
             <return type-id='type-id-5'/>
@@ -18798,7 +18798,7 @@
     </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-1044'>
       <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-1528'/>
+        <typedef-decl name='elt_t' type-id='type-id-107' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='320' column='1' id='type-id-1528'/>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='header' type-id='type-id-49' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='148' column='1'/>
@@ -18807,22 +18807,22 @@
         <var-decl name='in_error' type-id='type-id-7' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='150' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='MAX_G' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='321' column='1'/>
+        <var-decl name='MAX_G' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='321' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='SHIFT' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='322' column='1'/>
+        <var-decl name='SHIFT' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='322' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='BITS' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='323' column='1'/>
+        <var-decl name='BITS' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='323' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='MASK' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='324' column='1'/>
+        <var-decl name='MASK' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='324' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='ELTS' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='325' column='1'/>
+        <var-decl name='ELTS' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='325' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='INVALID' type-id='type-id-154' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='326' column='1'/>
+        <var-decl name='INVALID' type-id='type-id-155' 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-1529' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='332' column='1'/>
@@ -18860,45 +18860,45 @@
       <member-function access='public'>
         <function-decl name='add' mangled-name='_ZN8hb_set_t3addEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-842' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='add_range' mangled-name='_ZN8hb_set_t9add_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-842' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='del' mangled-name='_ZN8hb_set_t3delEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-842' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='del_range' mangled-name='_ZN8hb_set_t9del_rangeEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-842' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='has' mangled-name='_ZNK8hb_set_t3hasEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='197' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='intersects' mangled-name='_ZNK8hb_set_t10intersectsEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
@@ -18953,15 +18953,15 @@
       <member-function access='public'>
         <function-decl name='next' mangled-name='_ZNK8hb_set_t4nextEPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='next_range' mangled-name='_ZNK8hb_set_t10next_rangeEPjS0_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='276' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <parameter type-id='type-id-104'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-105'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
@@ -18974,33 +18974,33 @@
       <member-function access='public'>
         <function-decl name='get_min' mangled-name='_ZNK8hb_set_t7get_minEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='301' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <return type-id='type-id-68'/>
+          <return type-id='type-id-69'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='get_max' mangled-name='_ZNK8hb_set_t7get_maxEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='310' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <return type-id='type-id-68'/>
+          <return type-id='type-id-69'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='elt' mangled-name='_ZN8hb_set_t3eltEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-842' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-1530'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='elt' mangled-name='_ZNK8hb_set_t3eltEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='329' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-1528'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='mask' mangled-name='_ZNK8hb_set_t4maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='330' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-841' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-1528'/>
         </function-decl>
       </member-function>
@@ -19063,7 +19063,7 @@
     <pointer-type-def type-id='type-id-1493' size-in-bits='64' id='type-id-1494'/>
     <pointer-type-def type-id='type-id-1490' size-in-bits='64' id='type-id-1491'/>
     <array-type-def dimensions='1' type-id='type-id-1540' size-in-bits='16' id='type-id-1531'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-1541' size-in-bits='64' id='type-id-1485'/>
@@ -19156,8 +19156,8 @@
     <pointer-type-def type-id='type-id-1568' size-in-bits='64' id='type-id-1526'/>
     <pointer-type-def type-id='type-id-1569' size-in-bits='64' id='type-id-1527'/>
     <reference-type-def kind='lvalue' type-id='type-id-1570' size-in-bits='64' id='type-id-1533'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-1499'/>
-    <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-1471'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-1499'/>
+    <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-1471'/>
     <array-type-def dimensions='1' type-id='type-id-1528' size-in-bits='65536' id='type-id-1529'>
       <subrange length='2048' type-id='type-id-42' id='type-id-1571'/>
 
@@ -19176,7 +19176,7 @@
           <var-decl name='ruleSet' type-id='type-id-1572' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1813' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19254,7 +19254,7 @@
           <var-decl name='ruleSet' type-id='type-id-1572' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1896' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19329,7 +19329,7 @@
           <var-decl name='lookupX' type-id='type-id-756' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT19ChainContextFormat37closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2020' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19394,12 +19394,12 @@
           <var-decl name='rangeRecord' type-id='type-id-627' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1042' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1045' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='1045' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='get_class' mangled-name='_ZNK2OT15ClassDefFormat29get_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='994' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1579' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -19451,8 +19451,8 @@
         <member-function access='public' static='yes'>
           <function-decl name='group_get_glyph' mangled-name='_ZN2OT20CmapSubtableFormat1215group_get_glyphERKNS_21CmapSubtableLongGroupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1057'/>
-            <parameter type-id='type-id-68'/>
-            <return type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
+            <return type-id='type-id-69'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -19463,8 +19463,8 @@
         <member-function access='public' static='yes'>
           <function-decl name='group_get_glyph' mangled-name='_ZN2OT20CmapSubtableFormat1315group_get_glyphERKNS_21CmapSubtableLongGroupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1057'/>
-            <parameter type-id='type-id-68'/>
-            <return type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
+            <return type-id='type-id-69'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -19486,15 +19486,15 @@
           <var-decl name='glyphID' type-id='type-id-452' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='194' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='197' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT21CmapSubtableLongGroup3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1056' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -19525,7 +19525,7 @@
           <var-decl name='ruleSet' type-id='type-id-1582' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat17closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1251' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19597,7 +19597,7 @@
           <var-decl name='ruleSet' type-id='type-id-1582' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='closure' mangled-name='_ZNK2OT14ContextFormat27closureEPNS_20hb_closure_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='1337' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19713,10 +19713,10 @@
           <var-decl name='exitAnchor' type-id='type-id-585' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='867' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' 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'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT15EntryExitRecord8sanitizeEPNS_21hb_sanitize_context_tEPv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19743,7 +19743,7 @@
       <class-decl name='Index' 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='675' column='1' id='type-id-1296'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-257'/>
         <data-member access='public' static='yes'>
-          <var-decl name='NOT_FOUND_INDEX' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='676' column='1'/>
+          <var-decl name='NOT_FOUND_INDEX' type-id='type-id-76' 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>
     </namespace-decl>
@@ -19753,10 +19753,10 @@
           <var-decl name='v' type-id='type-id-1593' 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-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='628' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='set' mangled-name='_ZN2OT7IntTypeIjLj3EE3setEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-open-type-private.hh' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19830,10 +19830,10 @@
           <var-decl name='lookupListIndex' type-id='type-id-444' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='955' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='958' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT12LookupRecord8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='948' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -19904,13 +19904,13 @@
           <var-decl name='coverage' type-id='type-id-764' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='covers' mangled-name='_ZNK2OT20MarkGlyphSetsFormat16coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='275' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1599' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -20140,15 +20140,15 @@
           <var-decl name='value' type-id='type-id-444' 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'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='155' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT11RangeRecord3cmpEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-common-private.hh' line='133' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1182' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -20425,10 +20425,10 @@
           <var-decl name='glyphID' 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='318' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='320' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT10UVSMapping3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='307' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20461,10 +20461,10 @@
           <var-decl name='additionalCount' type-id='type-id-1292' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='297' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='300' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' 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>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='300' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='cmp' mangled-name='_ZNK2OT17UnicodeValueRange3cmpERKj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-cmap-table.hh' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20531,7 +20531,7 @@
       </member-function>
     </class-decl>
     <namespace-decl name='OT'>
-      <typedef-decl name='BYTE' type-id='type-id-144' 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-1292'/>
+      <typedef-decl name='BYTE' type-id='type-id-145' 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-1292'/>
     </namespace-decl>
     <pointer-type-def type-id='type-id-1626' size-in-bits='64' id='type-id-1497'/>
     <pointer-type-def type-id='type-id-1627' size-in-bits='64' id='type-id-1521'/>
@@ -20604,7 +20604,7 @@
     <qualified-type-def type-id='type-id-1641' const='yes' id='type-id-1570'/>
     <pointer-type-def type-id='type-id-1642' size-in-bits='64' id='type-id-1624'/>
     <function-type size-in-bits='64' id='type-id-1541'>
-      <parameter type-id='type-id-68'/>
+      <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-1643'/>
       <parameter type-id='type-id-20'/>
       <return type-id='type-id-7'/>
@@ -20731,7 +20731,7 @@
           <var-decl name='entryExitRecord' type-id='type-id-752' 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-75' 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'/>
+          <var-decl name='min_size' type-id='type-id-76' 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>
         <member-function access='public'>
           <function-decl name='collect_glyphs' mangled-name='_ZNK2OT17CursivePosFormat114collect_glyphsEPNS_27hb_collect_glyphs_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='876' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -20927,13 +20927,13 @@
     </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-1622'>
       <data-member access='public' static='yes'>
-        <var-decl name='mask_bytes' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
+        <var-decl name='mask_bytes' type-id='type-id-76' 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>
       <data-member access='public' static='yes'>
-        <var-decl name='mask_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
+        <var-decl name='mask_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='num_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
+        <var-decl name='num_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='mask' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
@@ -21034,13 +21034,13 @@
     <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-1641'/>
     <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-1660'>
       <data-member access='public' static='yes'>
-        <var-decl name='mask_bytes' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
+        <var-decl name='mask_bytes' type-id='type-id-76' 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>
       <data-member access='public' static='yes'>
-        <var-decl name='mask_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
+        <var-decl name='mask_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='num_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
+        <var-decl name='num_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='mask' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
@@ -21088,13 +21088,13 @@
     </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-1661'>
       <data-member access='public' static='yes'>
-        <var-decl name='mask_bytes' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='47' column='1'/>
+        <var-decl name='mask_bytes' type-id='type-id-76' 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>
       <data-member access='public' static='yes'>
-        <var-decl name='mask_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
+        <var-decl name='mask_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='48' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
-        <var-decl name='num_bits' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
+        <var-decl name='num_bits' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='0'>
         <var-decl name='mask' type-id='type-id-42' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set-private.hh' line='87' column='1'/>
@@ -21140,7 +21140,7 @@
         </function-decl>
       </member-function>
     </class-decl>
-    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='24' id='type-id-1644'>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='24' id='type-id-1644'>
       <subrange length='3' type-id='type-id-42' id='type-id-1680'/>
 
     </array-type-def>
@@ -21192,7 +21192,7 @@
           <var-decl name='markGlyphSetsDef' type-id='type-id-1684' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='421' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='426' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='426' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='has_glyph_classes' mangled-name='_ZNK2OT4GDEF17has_glyph_classesEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='337' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -21203,7 +21203,7 @@
         <member-function access='public'>
           <function-decl name='get_glyph_class' mangled-name='_ZNK2OT4GDEF15get_glyph_classEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='338' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1685' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -21224,7 +21224,7 @@
         <member-function access='public'>
           <function-decl name='get_mark_attachment_type' mangled-name='_ZNK2OT4GDEF24get_mark_attachment_typeEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1685' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -21237,7 +21237,7 @@
         <member-function access='public'>
           <function-decl name='get_attach_points' mangled-name='_ZNK2OT4GDEF17get_attach_pointsEjjPjS1_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1685' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-60'/>
@@ -21253,12 +21253,12 @@
         <member-function access='public'>
           <function-decl name='get_lig_carets' mangled-name='_ZNK2OT4GDEF14get_lig_caretsEP9hb_font_t14hb_direction_tjjPjPi' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='355' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1685' is-artificial='yes'/>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-125'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-126'/>
+            <parameter type-id='type-id-69'/>
             <parameter type-id='type-id-10'/>
             <parameter type-id='type-id-60'/>
-            <parameter type-id='type-id-162'/>
+            <parameter type-id='type-id-163'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -21272,7 +21272,7 @@
           <function-decl name='mark_set_covers' mangled-name='_ZNK2OT4GDEF15mark_set_coversEjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='364' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1685' is-artificial='yes'/>
             <parameter type-id='type-id-10'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-7'/>
           </function-decl>
         </member-function>
@@ -21286,7 +21286,7 @@
         <member-function access='public'>
           <function-decl name='get_glyph_props' mangled-name='_ZNK2OT4GDEF15get_glyph_propsEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gdef-table.hh' line='382' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-1685' is-artificial='yes'/>
-            <parameter type-id='type-id-68'/>
+            <parameter type-id='type-id-69'/>
             <return type-id='type-id-10'/>
           </function-decl>
         </member-function>
@@ -21315,7 +21315,7 @@
     </namespace-decl>
     <pointer-type-def type-id='type-id-1668' size-in-bits='64' id='type-id-1686'/>
     <array-type-def dimensions='1' type-id='type-id-606' size-in-bits='16' id='type-id-1684'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-1689' size-in-bits='64' id='type-id-1688'/>
@@ -21339,239 +21339,239 @@
   <abi-instr version='1.0' address-size='64' path='hb-font.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
 
     <function-decl name='hb_font_funcs_get_empty' mangled-name='hb_font_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_empty'>
-      <return type-id='type-id-159'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_font_funcs_is_immutable' mangled-name='hb_font_funcs_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_is_immutable'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='377' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_func' mangled-name='hb_font_funcs_set_glyph_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-182' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_h_advance_func' mangled-name='hb_font_funcs_set_glyph_h_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_advance_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-183' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_v_advance_func' mangled-name='hb_font_funcs_set_glyph_v_advance_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_advance_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-184' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_h_origin_func' mangled-name='hb_font_funcs_set_glyph_h_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_origin_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-185' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_v_origin_func' mangled-name='hb_font_funcs_set_glyph_v_origin_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_origin_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-186' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_h_kerning_func' mangled-name='hb_font_funcs_set_glyph_h_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_h_kerning_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-187' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_v_kerning_func' mangled-name='hb_font_funcs_set_glyph_v_kerning_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_v_kerning_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-188' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_extents_func' mangled-name='hb_font_funcs_set_glyph_extents_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_extents_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-189' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_contour_point_func' mangled-name='hb_font_funcs_set_glyph_contour_point_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_contour_point_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-190' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_name_func' mangled-name='hb_font_funcs_set_glyph_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_name_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-191' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_glyph_from_name_func' mangled-name='hb_font_funcs_set_glyph_from_name_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_glyph_from_name_func'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-192' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='411' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph' mangled-name='hb_font_get_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
-      <parameter type-id='type-id-68' name='variation_selector' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
-      <parameter type-id='type-id-104' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='433' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='431' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
+      <parameter type-id='type-id-69' name='variation_selector' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='432' column='1'/>
+      <parameter type-id='type-id-105' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='433' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_advance' mangled-name='hb_font_get_glyph_h_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_advance'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
-      <return type-id='type-id-149'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_advance' mangled-name='hb_font_get_glyph_v_advance' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_advance'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
-      <return type-id='type-id-149'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='450' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='451' column='1'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_origin' mangled-name='hb_font_get_glyph_h_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_origin'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_origin' mangled-name='hb_font_get_glyph_v_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_origin'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='488' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='489' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='490' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_h_kerning' mangled-name='hb_font_get_glyph_h_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_h_kerning'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
-      <parameter type-id='type-id-68' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
-      <parameter type-id='type-id-68' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
-      <return type-id='type-id-149'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-69' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <parameter type-id='type-id-69' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_v_kerning' mangled-name='hb_font_get_glyph_v_kerning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_v_kerning'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
-      <parameter type-id='type-id-68' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
-      <parameter type-id='type-id-68' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
-      <return type-id='type-id-149'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='529' column='1'/>
+      <parameter type-id='type-id-69' name='left_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <parameter type-id='type-id-69' name='right_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='530' column='1'/>
+      <return type-id='type-id-150'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_contour_point' mangled-name='hb_font_get_glyph_contour_point' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='589' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
       <parameter type-id='type-id-10' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='590' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='591' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_name' mangled-name='hb_font_get_glyph_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_name'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='610' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='611' column='1'/>
       <parameter type-id='type-id-61' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='612' column='1'/>
       <parameter type-id='type-id-10' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='612' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_empty' mangled-name='hb_font_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_empty'>
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <function-decl name='hb_font_is_immutable' mangled-name='hb_font_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_is_immutable'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1054' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_parent' mangled-name='hb_font_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_parent'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
-      <return type-id='type-id-157'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <function-decl name='hb_font_get_face' mangled-name='hb_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_face'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
-      <return type-id='type-id-158'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1086' column='1'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-decl name='hb_font_set_funcs_data' mangled-name='hb_font_set_funcs_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs_data'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1139' column='1'/>
       <parameter type-id='type-id-20' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1140' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1141' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_set_scale' mangled-name='hb_font_set_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_scale'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1169' column='1'/>
       <parameter type-id='type-id-4' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1170' column='1'/>
       <parameter type-id='type-id-4' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1171' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-4' size-in-bits='64' id='type-id-1691'/>
     <function-decl name='hb_font_get_scale' mangled-name='hb_font_get_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_scale'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1191' column='1'/>
       <parameter type-id='type-id-1691' name='x_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1192' column='1'/>
       <parameter type-id='type-id-1691' name='y_scale' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1193' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_set_ppem' mangled-name='hb_font_set_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_ppem'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1210' column='1'/>
       <parameter type-id='type-id-10' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1211' column='1'/>
       <parameter type-id='type-id-10' name='y_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1212' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_ppem' mangled-name='hb_font_get_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_ppem'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1232' column='1'/>
       <parameter type-id='type-id-60' name='x_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1233' column='1'/>
       <parameter type-id='type-id-60' name='y_ppem' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1234' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_make_immutable' mangled-name='hb_font_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_make_immutable'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_contour_point_for_origin' mangled-name='hb_font_get_glyph_contour_point_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_contour_point_for_origin'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='785' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
       <parameter type-id='type-id-10' name='point_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='786' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='787' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='788' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_kerning_for_direction' mangled-name='hb_font_get_glyph_kerning_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_kerning_for_direction'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
-      <parameter type-id='type-id-68' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
-      <parameter type-id='type-id-68' name='second_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='739' column='1'/>
+      <parameter type-id='type-id-69' name='first_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
+      <parameter type-id='type-id-69' name='second_glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='740' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='741' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='742' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_advance_for_direction' mangled-name='hb_font_get_glyph_advance_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_advance_for_direction'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_funcs_make_immutable' mangled-name='hb_font_funcs_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_make_immutable'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_user_data' mangled-name='hb_font_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_user_data'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1020' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1021' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='hb_font_funcs_get_user_data' mangled-name='hb_font_funcs_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_get_user_data'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='342' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='343' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='hb_font_set_user_data' mangled-name='hb_font_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_user_data'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='999' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1000' column='1'/>
       <parameter type-id='type-id-20' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1001' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1002' column='1'/>
@@ -21579,7 +21579,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_funcs_set_user_data' mangled-name='hb_font_funcs_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_set_user_data'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='321' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='322' column='1'/>
       <parameter type-id='type-id-20' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='323' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='324' column='1'/>
@@ -21587,113 +21587,113 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_reference' mangled-name='hb_font_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='952' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_reference'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
-      <return type-id='type-id-157'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <function-decl name='hb_font_funcs_reference' mangled-name='hb_font_funcs_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_reference'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
-      <return type-id='type-id-159'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='280' column='1'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_font_funcs_create' mangled-name='hb_font_funcs_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_create'>
-      <return type-id='type-id-159'/>
+      <return type-id='type-id-160'/>
     </function-decl>
     <function-decl name='hb_font_glyph_to_string' mangled-name='hb_font_glyph_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_to_string'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='806' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='807' column='1'/>
       <parameter type-id='type-id-61' name='s' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='808' column='1'/>
       <parameter type-id='type-id-10' name='size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='808' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_create' mangled-name='hb_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
-      <return type-id='type-id-157'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='851' column='1'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <function-decl name='hb_font_create_sub_font' mangled-name='hb_font_create_sub_font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_create_sub_font'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
-      <return type-id='type-id-157'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1070' column='1'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_extents' mangled-name='hb_font_get_glyph_extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
-      <parameter type-id='type-id-163' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='567' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='568' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='569' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_from_name' mangled-name='hb_font_get_glyph_from_name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_from_name'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <parameter type-id='type-id-50' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
-      <parameter type-id='type-id-104' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
+      <parameter type-id='type-id-105' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_glyph_from_string' mangled-name='hb_font_glyph_from_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_glyph_from_string'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='631' column='1'/>
       <parameter type-id='type-id-50' name='name' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
       <parameter type-id='type-id-4' name='len' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='632' column='1'/>
-      <parameter type-id='type-id-104' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
+      <parameter type-id='type-id-105' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='633' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_subtract_glyph_origin_for_direction' mangled-name='hb_font_subtract_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_subtract_glyph_origin_for_direction'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_add_glyph_origin_for_direction' mangled-name='hb_font_add_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_add_glyph_origin_for_direction'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_origin_for_direction' mangled-name='hb_font_get_glyph_origin_for_direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_origin_for_direction'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
-      <parameter type-id='type-id-162' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
-      <parameter type-id='type-id-162' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='654' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='655' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='656' column='1'/>
+      <parameter type-id='type-id-163' name='x' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
+      <parameter type-id='type-id-163' name='y' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='657' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_get_glyph_extents_for_origin' mangled-name='hb_font_get_glyph_extents_for_origin' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_get_glyph_extents_for_origin'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
-      <parameter type-id='type-id-163' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='761' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='762' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='763' column='1'/>
+      <parameter type-id='type-id-164' name='extents' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='764' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_font_funcs_destroy' mangled-name='hb_font_funcs_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_funcs_destroy'>
-      <parameter type-id='type-id-159' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
+      <parameter type-id='type-id-160' name='ffuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='358' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_set_funcs' mangled-name='hb_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_set_funcs'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
-      <parameter type-id='type-id-159' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1104' column='1'/>
+      <parameter type-id='type-id-160' name='klass' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1105' column='1'/>
       <parameter type-id='type-id-20' name='font_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1106' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1107' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_font_destroy' mangled-name='hb_font_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_font_destroy'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ot-tag.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_ot_tag_to_language' mangled-name='hb_ot_tag_to_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_language'>
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='868' column='1'/>
-      <return type-id='type-id-126'/>
+      <return type-id='type-id-127'/>
     </function-decl>
     <function-decl name='hb_ot_tag_from_language' mangled-name='hb_ot_tag_from_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_from_language'>
-      <parameter type-id='type-id-126' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1'/>
+      <parameter type-id='type-id-127' name='language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='806' column='1'/>
       <return type-id='type-id-180'/>
     </function-decl>
     <function-decl name='hb_ot_tag_to_script' mangled-name='hb_ot_tag_to_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tag_to_script'>
       <parameter type-id='type-id-180' name='tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-common.cc' line='368' column='1'/>
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='hb_ot_tags_from_script' mangled-name='hb_ot_tags_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_tags_from_script'>
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='130' column='1'/>
       <parameter type-id='type-id-1460' name='script_tag_1' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='131' column='1'/>
       <parameter type-id='type-id-1460' name='script_tag_2' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-tag.cc' line='132' column='1'/>
       <return type-id='type-id-5'/>
@@ -21719,15 +21719,15 @@
     </function-decl>
     <function-decl name='hb_set_get_min' mangled-name='hb_set_get_min' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_min'>
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <function-decl name='hb_set_get_max' mangled-name='hb_set_get_max' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_max'>
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='413' column='1'/>
-      <return type-id='type-id-68'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <function-decl name='hb_set_has' mangled-name='hb_set_has' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_has'>
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='200' column='1'/>
-      <parameter type-id='type-id-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='201' column='1'/>
+      <parameter type-id='type-id-69' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='201' column='1'/>
       <return type-id='type-id-26'/>
     </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'>
@@ -21761,24 +21761,24 @@
     </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-842' 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-68' 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-68' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
+      <parameter type-id='type-id-69' 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-69' 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-5'/>
     </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-842' 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-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
+      <parameter type-id='type-id-69' 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-5'/>
     </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-842' 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-68' 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-68' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='269' column='1'/>
+      <parameter type-id='type-id-69' 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-69' 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-5'/>
     </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-842' 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-68' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='251' column='1'/>
+      <parameter type-id='type-id-69' 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-5'/>
     </function-decl>
     <function-decl name='hb_set_get_population' mangled-name='hb_set_get_population' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_get_population'>
@@ -21815,13 +21815,13 @@
     </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-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='466' column='1'/>
-      <parameter type-id='type-id-104' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='467' column='1'/>
-      <parameter type-id='type-id-104' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='468' column='1'/>
+      <parameter type-id='type-id-105' name='first' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='467' column='1'/>
+      <parameter type-id='type-id-105' name='last' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='468' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_set_next' mangled-name='hb_set_next' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_set_next'>
       <parameter type-id='type-id-841' name='set' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='446' column='1'/>
-      <parameter type-id='type-id-104' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='447' column='1'/>
+      <parameter type-id='type-id-105' name='codepoint' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-set.cc' line='447' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
@@ -21829,22 +21829,22 @@
     <qualified-type-def type-id='type-id-50' const='yes' id='type-id-1692'/>
     <pointer-type-def type-id='type-id-1692' size-in-bits='64' id='type-id-1693'/>
     <function-decl name='hb_shape_full' mangled-name='hb_shape_full' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_full'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='347' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='348' column='1'/>
       <parameter type-id='type-id-229' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='349' column='1'/>
       <parameter type-id='type-id-10' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='350' column='1'/>
       <parameter type-id='type-id-1693' name='shaper_list' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='351' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_shape' mangled-name='hb_shape' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
-      <parameter type-id='type-id-79' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='379' column='1'/>
+      <parameter type-id='type-id-80' name='buffer' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='380' column='1'/>
       <parameter type-id='type-id-229' name='features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='381' column='1'/>
       <parameter type-id='type-id-10' name='num_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='382' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_shape_list_shapers' mangled-name='hb_shape_list_shapers' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_list_shapers'>
-      <return type-id='type-id-62'/>
+      <return type-id='type-id-63'/>
     </function-decl>
     <function-decl name='hb_feature_to_string' mangled-name='hb_feature_to_string' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_feature_to_string'>
       <parameter type-id='type-id-219' name='feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape.cc' line='243' column='1'/>
@@ -21869,8 +21869,8 @@
     </function-decl>
     <function-decl name='hb_shape_plan_execute' mangled-name='hb_shape_plan_execute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_execute'>
       <parameter type-id='type-id-176'/>
-      <parameter type-id='type-id-157'/>
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-80'/>
       <parameter type-id='type-id-229'/>
       <parameter type-id='type-id-10'/>
       <return type-id='type-id-26'/>
@@ -21897,7 +21897,7 @@
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_shape_plan_create' mangled-name='hb_shape_plan_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
       <parameter type-id='type-id-241' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
       <parameter type-id='type-id-229' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='114' column='1'/>
       <parameter type-id='type-id-10' name='num_user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='115' column='1'/>
@@ -21905,7 +21905,7 @@
       <return type-id='type-id-176'/>
     </function-decl>
     <function-decl name='hb_shape_plan_create_cached' mangled-name='hb_shape_plan_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_shape_plan_create_cached'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='112' column='1'/>
       <parameter type-id='type-id-241' name='props' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='113' column='1'/>
       <parameter type-id='type-id-229' name='user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='114' column='1'/>
       <parameter type-id='type-id-10' name='num_user_features' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-shape-plan.cc' line='115' column='1'/>
@@ -21915,128 +21915,128 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-unicode.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
     <function-decl name='hb_unicode_funcs_get_empty' mangled-name='hb_unicode_funcs_get_empty' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_empty'>
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_is_immutable' mangled-name='hb_unicode_funcs_is_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_is_immutable'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='330' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='330' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_get_parent' mangled-name='hb_unicode_funcs_get_parent' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_parent'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
-      <return type-id='type-id-66'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_combining_class_func' mangled-name='hb_unicode_funcs_set_combining_class_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_combining_class_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-90' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-91' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_eastasian_width_func' mangled-name='hb_unicode_funcs_set_eastasian_width_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_eastasian_width_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-91' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-92' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_general_category_func' mangled-name='hb_unicode_funcs_set_general_category_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_general_category_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-92' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-93' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_mirroring_func' mangled-name='hb_unicode_funcs_set_mirroring_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_mirroring_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-93' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-94' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_script_func' mangled-name='hb_unicode_funcs_set_script_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_script_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-94' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-95' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_compose_func' mangled-name='hb_unicode_funcs_set_compose_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_compose_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-95' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-96' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_decompose_func' mangled-name='hb_unicode_funcs_set_decompose_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_decompose_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-96' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-97' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_decompose_compatibility_func' mangled-name='hb_unicode_funcs_set_decompose_compatibility_func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_decompose_compatibility_func'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
-      <parameter type-id='type-id-97' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
+      <parameter type-id='type-id-98' name='func' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-20' name='user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='377' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_combining_class' mangled-name='hb_unicode_combining_class' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_combining_class'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <return type-id='type-id-101'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='hb_unicode_eastasian_width' mangled-name='hb_unicode_eastasian_width' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_eastasian_width'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_unicode_general_category' mangled-name='hb_unicode_general_category' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_general_category'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <return type-id='type-id-102'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <return type-id='type-id-103'/>
     </function-decl>
     <function-decl name='hb_unicode_mirroring' mangled-name='hb_unicode_mirroring' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_mirroring'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <return type-id='type-id-68'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <return type-id='type-id-69'/>
     </function-decl>
     <function-decl name='hb_unicode_script' mangled-name='hb_unicode_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_script'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <parameter type-id='type-id-68' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
-      <return type-id='type-id-103'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <parameter type-id='type-id-69' name='unicode' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='389' column='1'/>
+      <return type-id='type-id-104'/>
     </function-decl>
     <function-decl name='hb_unicode_decompose' mangled-name='hb_unicode_decompose' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='428' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_decompose'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='428' column='1'/>
-      <parameter type-id='type-id-68' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='429' column='1'/>
-      <parameter type-id='type-id-104' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='430' column='1'/>
-      <parameter type-id='type-id-104' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='431' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='428' column='1'/>
+      <parameter type-id='type-id-69' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='429' column='1'/>
+      <parameter type-id='type-id-105' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='430' column='1'/>
+      <parameter type-id='type-id-105' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='431' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_unicode_decompose_compatibility' mangled-name='hb_unicode_decompose_compatibility' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_decompose_compatibility'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='449' column='1'/>
-      <parameter type-id='type-id-68' name='u' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='450' column='1'/>
-      <parameter type-id='type-id-104' name='decomposed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='451' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='449' column='1'/>
+      <parameter type-id='type-id-69' name='u' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='450' column='1'/>
+      <parameter type-id='type-id-105' name='decomposed' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='451' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_unicode_compose' mangled-name='hb_unicode_compose' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_compose'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='406' column='1'/>
-      <parameter type-id='type-id-68' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='407' column='1'/>
-      <parameter type-id='type-id-68' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='408' column='1'/>
-      <parameter type-id='type-id-104' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='409' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='406' column='1'/>
+      <parameter type-id='type-id-69' name='a' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='407' column='1'/>
+      <parameter type-id='type-id-69' name='b' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='408' column='1'/>
+      <parameter type-id='type-id-105' name='ab' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='409' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_make_immutable' mangled-name='hb_unicode_funcs_make_immutable' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_make_immutable'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_get_user_data' mangled-name='hb_unicode_funcs_get_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_user_data'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='295' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='295' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='296' column='1'/>
       <return type-id='type-id-20'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_set_user_data' mangled-name='hb_unicode_funcs_set_user_data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_set_user_data'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='274' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='274' column='1'/>
       <parameter type-id='type-id-17' name='key' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='275' column='1'/>
       <parameter type-id='type-id-20' name='data' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='276' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='277' column='1'/>
@@ -22044,19 +22044,19 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_reference' mangled-name='hb_unicode_funcs_reference' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_reference'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
-      <return type-id='type-id-66'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_destroy' mangled-name='hb_unicode_funcs_destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_destroy'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='311' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_create' mangled-name='hb_unicode_funcs_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_create'>
-      <parameter type-id='type-id-66' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
-      <return type-id='type-id-66'/>
+      <parameter type-id='type-id-67' name='ufuncs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='346' column='1'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <function-decl name='hb_unicode_funcs_get_default' mangled-name='hb_unicode_funcs_get_default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-unicode.cc' line='129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_unicode_funcs_get_default'>
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
@@ -22083,7 +22083,7 @@
           <var-decl name='leadingBearingX' type-id='type-id-1696' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='76' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='90' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='90' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='sanitize' mangled-name='_ZN2OT4_mtx8sanitizeEPNS_21hb_sanitize_context_tE' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22113,10 +22113,10 @@
           <var-decl name='lsb' type-id='type-id-501' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='48' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_instance_assertion_on_line_50' mangled-name='_ZNK2OT10LongMetric30_instance_assertion_on_line_50Ev' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-hmtx-table.hh' line='50' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22190,7 +22190,7 @@
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN29hb_ot_face_cmap_accelerator_t4initEP9hb_face_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1705' is-artificial='yes'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -22203,9 +22203,9 @@
       <member-function access='public'>
         <function-decl name='get_glyph' mangled-name='_ZNK29hb_ot_face_cmap_accelerator_t9get_glyphEjjPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='134' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1706' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-68'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-69'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
@@ -22232,7 +22232,7 @@
       <member-function access='public'>
         <function-decl name='init' mangled-name='_ZN32hb_ot_face_metrics_accelerator_t4initEP9hb_face_tjjj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='46' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1709' is-artificial='yes'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <parameter type-id='type-id-180'/>
           <parameter type-id='type-id-180'/>
           <parameter type-id='type-id-10'/>
@@ -22248,7 +22248,7 @@
       <member-function access='public'>
         <function-decl name='get_advance' mangled-name='_ZNK32hb_ot_face_metrics_accelerator_t11get_advanceEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='74' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1710' is-artificial='yes'/>
-          <parameter type-id='type-id-68'/>
+          <parameter type-id='type-id-69'/>
           <return type-id='type-id-10'/>
         </function-decl>
       </member-function>
@@ -22257,12 +22257,12 @@
     <pointer-type-def type-id='type-id-1711' size-in-bits='64' id='type-id-1700'/>
 
     <array-type-def dimensions='1' type-id='type-id-1699' size-in-bits='32' id='type-id-1695'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
 
     <array-type-def dimensions='1' type-id='type-id-501' size-in-bits='16' id='type-id-1696'>
-      <subrange length='1' type-id='type-id-42' id='type-id-171'/>
+      <subrange length='1' type-id='type-id-42' id='type-id-167'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-1694' size-in-bits='64' id='type-id-1697'/>
@@ -22272,7 +22272,7 @@
     <qualified-type-def type-id='type-id-1708' const='yes' id='type-id-1713'/>
     <pointer-type-def type-id='type-id-1713' size-in-bits='64' id='type-id-1710'/>
     <function-decl name='hb_ot_font_set_funcs' mangled-name='hb_ot_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-font.cc' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_font_set_funcs'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
   </abi-instr>
@@ -22284,10 +22284,10 @@
           <var-decl name='tableTag' type-id='type-id-495' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1319' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1334' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GSUB10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1321' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22298,15 +22298,15 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='substitute_start' mangled-name='_ZN2OT4GSUB16substitute_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1324' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-80'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='substitute_finish' mangled-name='_ZN2OT4GSUB17substitute_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsub-table.hh' line='1325' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-80'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -22344,10 +22344,10 @@
           <var-decl name='lookupList' type-id='type-id-608' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2310' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2312' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_script_count' mangled-name='_ZNK2OT8GSUBGPOS16get_script_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gsubgpos-private.hh' line='2263' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22485,10 +22485,10 @@
           <var-decl name='tableTag' type-id='type-id-495' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1518' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='static_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
+          <var-decl name='static_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
         </data-member>
         <data-member access='public' static='yes'>
-          <var-decl name='min_size' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
+          <var-decl name='min_size' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1533' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='get_lookup' mangled-name='_ZNK2OT4GPOS10get_lookupEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1520' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22499,15 +22499,15 @@
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='position_start' mangled-name='_ZN2OT4GPOS14position_startEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1523' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-80'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='position_finish' mangled-name='_ZN2OT4GPOS15position_finishEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout-gpos-table.hh' line='1524' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-157'/>
-            <parameter type-id='type-id-79'/>
+            <parameter type-id='type-id-158'/>
+            <parameter type-id='type-id-80'/>
             <return type-id='type-id-5'/>
           </function-decl>
         </member-function>
@@ -22740,19 +22740,19 @@
             <var-decl name='tag' type-id='type-id-180' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='46' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='index' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='47' column='1'/>
+            <var-decl name='index' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='47' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
-            <var-decl name='stage' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='48' column='1'/>
+            <var-decl name='stage' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='48' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='160'>
             <var-decl name='shift' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='49' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
-            <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='50' column='1'/>
+            <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='50' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='224'>
-            <var-decl name='_1_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='51' column='1'/>
+            <var-decl name='_1_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='51' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='31'>
             <var-decl name='needs_fallback' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='52' column='1'/>
@@ -22772,13 +22772,13 @@
       <member-type access='public'>
         <class-decl name='lookup_map_t' size-in-bits='64' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='59' column='1' id='type-id-1742'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='index' type-id='type-id-139' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
+            <var-decl name='index' type-id='type-id-140' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='60' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='15'>
-            <var-decl name='auto_zwj' type-id='type-id-139' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='61' column='1'/>
+            <var-decl name='auto_zwj' type-id='type-id-140' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='61' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='62' column='1'/>
+            <var-decl name='mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='62' column='1'/>
           </data-member>
           <member-function access='public' static='yes'>
             <function-decl name='cmp' mangled-name='_ZN11hb_ot_map_t12lookup_map_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -22809,7 +22809,7 @@
         <var-decl name='found_script' type-id='type-id-1748' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='138' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='96'>
-        <var-decl name='global_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='148' column='1'/>
+        <var-decl name='global_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='148' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='128'>
         <var-decl name='features' type-id='type-id-1749' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='150' column='1'/>
@@ -22829,7 +22829,7 @@
       <member-function access='public'>
         <function-decl name='get_global_mask' mangled-name='_ZNK11hb_ot_map_t15get_global_maskEv' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1753' is-artificial='yes'/>
-          <return type-id='type-id-86'/>
+          <return type-id='type-id-87'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -22837,7 +22837,7 @@
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <parameter type-id='type-id-180'/>
           <parameter type-id='type-id-60'/>
-          <return type-id='type-id-86'/>
+          <return type-id='type-id-87'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -22851,7 +22851,7 @@
         <function-decl name='get_1_mask' mangled-name='_ZNK11hb_ot_map_t10get_1_maskEj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <parameter type-id='type-id-180'/>
-          <return type-id='type-id-86'/>
+          <return type-id='type-id-87'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
@@ -22892,8 +22892,8 @@
         <function-decl name='substitute' mangled-name='_ZNK11hb_ot_map_t10substituteEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <parameter type-id='type-id-1755'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-80'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -22901,8 +22901,8 @@
         <function-decl name='position' mangled-name='_ZNK11hb_ot_map_t8positionEPK18hb_ot_shape_plan_tP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <parameter type-id='type-id-1755'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-80'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -22915,10 +22915,10 @@
       <member-function access='private'>
         <function-decl name='add_lookups' mangled-name='_ZN11hb_ot_map_t11add_lookupsEP9hb_face_tjjjb' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='142' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1752' is-artificial='yes'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <parameter type-id='type-id-10'/>
           <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-86'/>
+          <parameter type-id='type-id-87'/>
           <parameter type-id='type-id-7'/>
           <return type-id='type-id-5'/>
         </function-decl>
@@ -22928,8 +22928,8 @@
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <parameter type-id='type-id-1756'/>
           <parameter type-id='type-id-1755'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-80'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -22938,8 +22938,8 @@
           <parameter type-id='type-id-1753' is-artificial='yes'/>
           <parameter type-id='type-id-1757'/>
           <parameter type-id='type-id-1755'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-80'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -22950,7 +22950,7 @@
     <pointer-type-def type-id='type-id-1759' size-in-bits='64' id='type-id-1743'/>
     <class-decl name='hb_ot_shape_plan_t' size-in-bits='8768' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='38' column='1' id='type-id-1760'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='39' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='shaper' type-id='type-id-1761' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='40' column='1'/>
@@ -22962,19 +22962,19 @@
         <var-decl name='data' type-id='type-id-20' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='42' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8576'>
-        <var-decl name='rtlm_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='rtlm_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8608'>
-        <var-decl name='frac_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='frac_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8640'>
-        <var-decl name='numr_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='numr_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8672'>
-        <var-decl name='dnom_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
+        <var-decl name='dnom_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='43' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8704'>
-        <var-decl name='kern_mask' type-id='type-id-86' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='44' column='1'/>
+        <var-decl name='kern_mask' type-id='type-id-87' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='44' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
         <var-decl name='has_frac' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='45' column='1'/>
@@ -22996,16 +22996,16 @@
       <member-function access='public'>
         <function-decl name='substitute' mangled-name='_ZNK18hb_ot_shape_plan_t10substituteEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='59' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1755' is-artificial='yes'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-80'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
       <member-function access='public'>
         <function-decl name='position' mangled-name='_ZNK18hb_ot_shape_plan_t8positionEP9hb_font_tP11hb_buffer_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='60' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1755' is-artificial='yes'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-79'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-80'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -23119,7 +23119,7 @@
     <pointer-type-def type-id='type-id-1740' size-in-bits='64' id='type-id-1765'/>
 
     <array-type-def dimensions='1' type-id='type-id-1740' size-in-bits='2304' id='type-id-1766'>
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-1749' size-in-bits='64' id='type-id-1767'/>
@@ -23237,7 +23237,7 @@
         <typedef-decl name='Lookup' type-id='type-id-628' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='807' column='1' id='type-id-1783'/>
       </member-type>
       <data-member access='public' static='yes'>
-        <var-decl name='table_index' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='805' column='1'/>
+        <var-decl name='table_index' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='805' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <var-decl name='inplace' type-id='type-id-1784' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='806' column='1'/>
@@ -23251,7 +23251,7 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='GSUBProxy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='809' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1787' is-artificial='yes'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -23310,7 +23310,7 @@
         <typedef-decl name='Lookup' type-id='type-id-979' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='821' column='1' id='type-id-1795'/>
       </member-type>
       <data-member access='public' static='yes'>
-        <var-decl name='table_index' type-id='type-id-75' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='819' column='1'/>
+        <var-decl name='table_index' type-id='type-id-76' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='819' column='1'/>
       </data-member>
       <data-member access='public' static='yes'>
         <var-decl name='inplace' type-id='type-id-1784' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='820' column='1'/>
@@ -23324,7 +23324,7 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='GPOSProxy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='823' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1797' is-artificial='yes'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <return type-id='type-id-5'/>
         </function-decl>
       </member-function>
@@ -23338,7 +23338,7 @@
     <pointer-type-def type-id='type-id-1744' size-in-bits='64' id='type-id-1733'/>
 
     <array-type-def dimensions='1' type-id='type-id-1744' size-in-bits='512' id='type-id-1734'>
-      <subrange length='4' type-id='type-id-42' id='type-id-145'/>
+      <subrange length='4' type-id='type-id-42' id='type-id-146'/>
 
     </array-type-def>
     <pointer-type-def type-id='type-id-1732' size-in-bits='64' id='type-id-1735'/>
@@ -23350,20 +23350,20 @@
     <pointer-type-def type-id='type-id-1798' size-in-bits='64' id='type-id-1721'/>
     <pointer-type-def type-id='type-id-1720' size-in-bits='64' id='type-id-1722'/>
     <function-decl name='hb_ot_layout_table_get_lookup_count' mangled-name='hb_ot_layout_table_get_lookup_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_lookup_count'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='437' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='438' column='1'/>
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_has_positioning' mangled-name='hb_ot_layout_has_positioning' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_positioning'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_has_substitution' mangled-name='hb_ot_layout_has_substitution' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_substitution'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_feature_get_lookups' mangled-name='hb_ot_layout_feature_get_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_feature_get_lookups'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='423' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='424' column='1'/>
       <parameter type-id='type-id-10' name='feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='425' column='1'/>
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='426' column='1'/>
@@ -23372,7 +23372,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_script_get_language_tags' mangled-name='hb_ot_layout_script_get_language_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_get_language_tags'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='290' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='291' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='292' column='1'/>
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='293' column='1'/>
@@ -23381,7 +23381,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_get_feature_tags' mangled-name='hb_ot_layout_table_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_feature_tags'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='279' column='1'/>
       <parameter type-id='type-id-60' name='feature_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='280' column='1'/>
@@ -23389,7 +23389,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_table_get_script_tags' mangled-name='hb_ot_layout_table_get_script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_get_script_tags'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='277' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='278' column='1'/>
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='279' column='1'/>
       <parameter type-id='type-id-60' name='feature_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='280' column='1'/>
@@ -23397,11 +23397,11 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_has_glyph_classes' mangled-name='hb_ot_layout_has_glyph_classes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='126' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_has_glyph_classes'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-face.cc' line='318' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_size_params' mangled-name='hb_ot_layout_get_size_params' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_size_params'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='752' column='1'/>
       <parameter type-id='type-id-60' name='design_size' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='753' column='1'/>
       <parameter type-id='type-id-60' name='subfamily_id' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='754' column='1'/>
       <parameter type-id='type-id-60' name='subfamily_name_id' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='755' column='1'/>
@@ -23410,7 +23410,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_find_feature' mangled-name='hb_ot_layout_language_find_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_find_feature'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='397' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='398' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='399' column='1'/>
       <parameter type-id='type-id-10' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='400' column='1'/>
@@ -23419,7 +23419,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_feature_tags' mangled-name='hb_ot_layout_language_get_feature_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_tags'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='372' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='373' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='374' column='1'/>
       <parameter type-id='type-id-10' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='375' column='1'/>
@@ -23429,7 +23429,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_feature_indexes' mangled-name='hb_ot_layout_language_get_feature_indexes' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_feature_indexes'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='357' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='358' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='359' column='1'/>
       <parameter type-id='type-id-10' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='360' column='1'/>
@@ -23439,7 +23439,7 @@
       <return type-id='type-id-10'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_required_feature' mangled-name='hb_ot_layout_language_get_required_feature' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='339' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='340' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='341' column='1'/>
       <parameter type-id='type-id-10' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='342' column='1'/>
@@ -23448,7 +23448,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_language_get_required_feature_index' mangled-name='hb_ot_layout_language_get_required_feature_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_language_get_required_feature_index'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='324' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='325' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='326' column='1'/>
       <parameter type-id='type-id-10' name='language_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='327' column='1'/>
@@ -23456,7 +23456,7 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_script_find_language' mangled-name='hb_ot_layout_script_find_language' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_script_find_language'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='303' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='304' column='1'/>
       <parameter type-id='type-id-10' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='305' column='1'/>
       <parameter type-id='type-id-180' name='language_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='306' column='1'/>
@@ -23464,16 +23464,16 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_lookup_would_substitute' mangled-name='hb_ot_layout_lookup_would_substitute' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_lookup_would_substitute'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='680' column='1'/>
       <parameter type-id='type-id-10' name='lookup_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='681' column='1'/>
-      <parameter type-id='type-id-85' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='682' column='1'/>
+      <parameter type-id='type-id-86' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='682' column='1'/>
       <parameter type-id='type-id-10' name='glyphs_length' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='683' column='1'/>
       <parameter type-id='type-id-26' name='zero_context' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='684' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_attach_points' mangled-name='hb_ot_layout_get_attach_points' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_attach_points'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='148' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='147' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='148' column='1'/>
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='149' column='1'/>
       <parameter type-id='type-id-60' name='point_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='150' column='1'/>
       <parameter type-id='type-id-60' name='point_array' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='151' column='1'/>
@@ -23481,7 +23481,7 @@
     </function-decl>
     <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-1803'/>
     <function-decl name='hb_ot_layout_table_choose_script' mangled-name='hb_ot_layout_table_choose_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_table_choose_script'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='229' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='230' column='1'/>
       <parameter type-id='type-id-1803' name='script_tags' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='231' column='1'/>
       <parameter type-id='type-id-60' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='232' column='1'/>
@@ -23489,9 +23489,9 @@
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_get_ligature_carets' mangled-name='hb_ot_layout_get_ligature_carets' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_get_ligature_carets'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
-      <parameter type-id='type-id-125' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='159' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='157' column='1'/>
+      <parameter type-id='type-id-126' name='direction' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='158' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='159' column='1'/>
       <parameter type-id='type-id-10' name='start_offset' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='160' column='1'/>
       <parameter type-id='type-id-60' name='caret_count' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='161' column='1'/>
       <parameter type-id='type-id-1691' name='caret_array' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='162' column='1'/>
@@ -23506,20 +23506,20 @@
       <enumerator name='HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT' value='4'/>
     </enum-decl>
     <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-158' 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-159' 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-1804' 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-842' 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-5'/>
     </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'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='199' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='200' column='1'/>
       <parameter type-id='type-id-180' name='script_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='201' column='1'/>
       <parameter type-id='type-id-60' name='script_index' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='202' column='1'/>
       <return type-id='type-id-26'/>
     </function-decl>
     <function-decl name='hb_ot_layout_collect_lookups' mangled-name='hb_ot_layout_collect_lookups' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ot_layout_collect_lookups'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='594' column='1'/>
       <parameter type-id='type-id-180' name='table_tag' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='595' column='1'/>
       <parameter type-id='type-id-1803' 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-1803' name='languages' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='597' column='1'/>
@@ -23528,7 +23528,7 @@
       <return type-id='type-id-5'/>
     </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-158' 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-159' 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-180' 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-10' 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-842' name='glyphs_before' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='638' column='1'/>
@@ -23538,22 +23538,22 @@
       <return type-id='type-id-5'/>
     </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-158' 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-159' 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-10' 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-842' 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-5'/>
     </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'>
-      <parameter type-id='type-id-158' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
-      <parameter type-id='type-id-68' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='133' column='1'/>
+      <parameter type-id='type-id-159' name='face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='132' column='1'/>
+      <parameter type-id='type-id-69' name='glyph' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-layout.cc' line='133' column='1'/>
       <return type-id='type-id-1804'/>
     </function-decl>
     <reference-type-def kind='lvalue' type-id='type-id-1805' size-in-bits='64' id='type-id-1791'/>
     <pointer-type-def type-id='type-id-1806' size-in-bits='64' id='type-id-1761'/>
     <function-type size-in-bits='64' id='type-id-1764'>
       <parameter type-id='type-id-1755'/>
-      <parameter type-id='type-id-157'/>
-      <parameter type-id='type-id-79'/>
+      <parameter type-id='type-id-158'/>
+      <parameter type-id='type-id-80'/>
       <return type-id='type-id-5'/>
     </function-type>
     <pointer-type-def type-id='type-id-1760' size-in-bits='64' id='type-id-1762'/>
@@ -23600,7 +23600,7 @@
     <pointer-type-def type-id='type-id-1816' size-in-bits='64' id='type-id-1813'/>
     <pointer-type-def type-id='type-id-1817' size-in-bits='64' id='type-id-1814'/>
     <array-type-def dimensions='1' type-id='type-id-28' size-in-bits='64' id='type-id-1808'>
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <enum-decl name='hb_ot_shape_normalization_mode_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='38' column='1' id='type-id-1812'>
@@ -23624,22 +23624,22 @@
     <pointer-type-def type-id='type-id-1820' size-in-bits='64' id='type-id-1810'/>
     <function-type size-in-bits='64' id='type-id-1816'>
       <parameter type-id='type-id-1821'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-104'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-105'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-7'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1817'>
       <parameter type-id='type-id-1821'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-68'/>
-      <parameter type-id='type-id-104'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-105'/>
       <return type-id='type-id-7'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1818'>
       <parameter type-id='type-id-1755'/>
-      <parameter type-id='type-id-79'/>
-      <parameter type-id='type-id-157'/>
+      <parameter type-id='type-id-80'/>
+      <parameter type-id='type-id-158'/>
       <return type-id='type-id-5'/>
     </function-type>
     <function-type size-in-bits='64' id='type-id-1819'>
@@ -23655,10 +23655,10 @@
     <qualified-type-def type-id='type-id-1825' const='yes' id='type-id-1823'/>
     <class-decl name='hb_ot_shape_planner_t' size-in-bits='10624' is-struct='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='66' column='1' id='type-id-1824'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
+        <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='68' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='69' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='shaper' type-id='type-id-1761' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-private.hh' line='70' column='1'/>
@@ -23724,7 +23724,7 @@
             <var-decl name='default_value' type-id='type-id-10' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='215' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='160'>
-            <var-decl name='stage' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='216' column='1'/>
+            <var-decl name='stage' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='216' column='1'/>
           </data-member>
           <member-function access='public' static='yes'>
             <function-decl name='cmp' mangled-name='_ZN19hb_ot_map_builder_t14feature_info_t3cmpEPKS0_S2_' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -23746,10 +23746,10 @@
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='face' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
+        <var-decl name='face' type-id='type-id-159' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='231' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='props' type-id='type-id-70' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='232' column='1'/>
+        <var-decl name='props' type-id='type-id-71' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='232' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='chosen_script' type-id='type-id-1747' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='234' column='1'/>
@@ -23758,13 +23758,13 @@
         <var-decl name='found_script' type-id='type-id-1748' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='235' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='416'>
-        <var-decl name='script_index' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
+        <var-decl name='script_index' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='480'>
-        <var-decl name='language_index' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
+        <var-decl name='language_index' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='236' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='544'>
-        <var-decl name='current_stage' type-id='type-id-77' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='240' column='1'/>
+        <var-decl name='current_stage' type-id='type-id-78' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='240' column='1'/>
       </data-member>
       <data-member access='private' layout-offset-in-bits='640'>
         <var-decl name='feature_infos' type-id='type-id-1835' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='241' column='1'/>
@@ -23775,7 +23775,7 @@
       <member-function access='public' constructor='yes'>
         <function-decl name='hb_ot_map_builder_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-map-private.hh' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1837' is-artificial='yes'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <parameter type-id='type-id-241'/>
           <return type-id='type-id-5'/>
         </function-decl>
@@ -23837,13 +23837,13 @@
         <var-decl name='plan' type-id='type-id-1755' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='54' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='buffer' type-id='type-id-79' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
+        <var-decl name='buffer' type-id='type-id-80' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='font' type-id='type-id-157' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
+        <var-decl name='font' type-id='type-id-158' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='unicode' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
+        <var-decl name='unicode' type-id='type-id-67' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='decompose' type-id='type-id-1813' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-normalize-private.hh' line='61' column='1'/>
@@ -24044,7 +24044,7 @@
     <pointer-type-def type-id='type-id-1834' size-in-bits='64' id='type-id-1848'/>
     <pointer-type-def type-id='type-id-1840' size-in-bits='64' id='type-id-1850'/>
     <array-type-def dimensions='1' type-id='type-id-1834' size-in-bits='1024' id='type-id-1849'>
-      <subrange length='8' type-id='type-id-42' id='type-id-150'/>
+      <subrange length='8' type-id='type-id-42' id='type-id-151'/>
 
     </array-type-def>
     <qualified-type-def type-id='type-id-1834' const='yes' id='type-id-1854'/>
@@ -24066,8 +24066,8 @@
       <return type-id='type-id-5'/>
     </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'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
-      <parameter type-id='type-id-79' 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-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='770' column='1'/>
+      <parameter type-id='type-id-80' 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-229' 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-10' 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-842' name='glyphs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape.cc' line='774' column='1'/>
@@ -24096,7 +24096,7 @@
         <var-decl name='is_old_spec' type-id='type-id-7' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='531' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='virama_glyph' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='532' column='1'/>
+        <var-decl name='virama_glyph' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='532' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='rphf' type-id='type-id-1858' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='534' column='1'/>
@@ -24122,21 +24122,21 @@
       <member-function access='public'>
         <function-decl name='get_virama_glyph' mangled-name='_ZNK18indic_shape_plan_t16get_virama_glyphEP9hb_font_tPj' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='510' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1860' is-artificial='yes'/>
-          <parameter type-id='type-id-157'/>
-          <parameter type-id='type-id-104'/>
+          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-105'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
     </class-decl>
     <class-decl name='indic_config_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-shape-complex-indic.cc' line='305' column='1' id='type-id-1861'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='script' type-id='type-id-103' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='306' column='1'/>
+        <var-decl name='script' type-id='type-id-104' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='306' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='has_old_spec' type-id='type-id-7' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='307' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='virama' type-id='type-id-68' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='308' column='1'/>
+        <var-decl name='virama' type-id='type-id-69' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='308' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
         <var-decl name='base_pos' type-id='type-id-1862' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='309' column='1'/>
@@ -24211,9 +24211,9 @@
       <member-function access='public'>
         <function-decl name='would_substitute' mangled-name='_ZNK26would_substitute_feature_t16would_substituteEPKjjP9hb_face_t' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ot-shape-complex-indic.cc' line='490' column='1' visibility='default' binding='global' size-in-bits='64'>
           <parameter type-id='type-id-1869' is-artificial='yes'/>
-          <parameter type-id='type-id-85'/>
+          <parameter type-id='type-id-86'/>
           <parameter type-id='type-id-10'/>
-          <parameter type-id='type-id-158'/>
+          <parameter type-id='type-id-159'/>
           <return type-id='type-id-7'/>
         </function-decl>
       </member-function>
@@ -24222,7 +24222,7 @@
     <qualified-type-def type-id='type-id-1858' const='yes' id='type-id-1870'/>
     <pointer-type-def type-id='type-id-1870' size-in-bits='64' id='type-id-1869'/>
 
-    <array-type-def dimensions='1' type-id='type-id-86' size-in-bits='672' id='type-id-1859'>
+    <array-type-def dimensions='1' type-id='type-id-87' size-in-bits='672' id='type-id-1859'>
       <subrange length='21' type-id='type-id-42' id='type-id-1871'/>
 
     </array-type-def>
@@ -24252,7 +24252,7 @@
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <function-decl name='hb_glib_get_unicode_funcs' mangled-name='hb_glib_get_unicode_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_get_unicode_funcs'>
-      <return type-id='type-id-66'/>
+      <return type-id='type-id-67'/>
     </function-decl>
     <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-1873'>
       <underlying-type type-id='type-id-56'/>
@@ -24385,12 +24385,12 @@
       <enumerator name='G_UNICODE_SCRIPT_WARANG_CITI' value='125'/>
     </enum-decl>
     <function-decl name='hb_glib_script_from_script' mangled-name='hb_glib_script_from_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_script_from_script'>
-      <parameter type-id='type-id-103' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1'/>
+      <parameter type-id='type-id-104' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='177' column='1'/>
       <return type-id='type-id-1873'/>
     </function-decl>
     <function-decl name='hb_glib_script_to_script' mangled-name='hb_glib_script_to_script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_glib_script_to_script'>
       <parameter type-id='type-id-1873' name='script' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-glib.cc' line='161' column='1'/>
-      <return type-id='type-id-103'/>
+      <return type-id='type-id-104'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='hb-ft.cc' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src' language='LANG_C_plus_plus'>
@@ -24510,7 +24510,7 @@
         <var-decl name='y_ppem' type-id='type-id-1894' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='341' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='FT_Short' type-id='type-id-141' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-1883'/>
+    <typedef-decl name='FT_Short' type-id='type-id-142' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='194' column='1' id='type-id-1883'/>
     <typedef-decl name='FT_Pos' type-id='type-id-39' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='58' column='1' id='type-id-1894'/>
     <typedef-decl name='FT_Bitmap_Size' type-id='type-id-1893' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='343' column='1' id='type-id-1895'/>
     <pointer-type-def type-id='type-id-1895' size-in-bits='64' id='type-id-1878'/>
@@ -24553,7 +24553,7 @@
       <enumerator name='FT_ENCODING_APPLE_ROMAN' value='1634889070'/>
     </enum-decl>
     <typedef-decl name='FT_Encoding' type-id='type-id-1900' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='727' column='1' id='type-id-1898'/>
-    <typedef-decl name='FT_UShort' type-id='type-id-139' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-1882'/>
+    <typedef-decl name='FT_UShort' type-id='type-id-140' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/fttypes.h' line='205' column='1' id='type-id-1882'/>
     <pointer-type-def type-id='type-id-1896' size-in-bits='64' id='type-id-1901'/>
     <typedef-decl name='FT_CharMap' type-id='type-id-1901' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='524' column='1' id='type-id-1886'/>
     <pointer-type-def type-id='type-id-1886' size-in-bits='64' id='type-id-1879'/>
@@ -24716,7 +24716,7 @@
         <var-decl name='buffer' type-id='type-id-1923' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='324' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='num_grays' type-id='type-id-141' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='325' column='1'/>
+        <var-decl name='num_grays' type-id='type-id-142' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='325' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='208'>
         <var-decl name='pixel_mode' type-id='type-id-28' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='326' column='1'/>
@@ -24728,14 +24728,14 @@
         <var-decl name='palette' type-id='type-id-20' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='328' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-143' size-in-bits='64' id='type-id-1923'/>
+    <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-1923'/>
     <typedef-decl name='FT_Bitmap' type-id='type-id-1922' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='330' column='1' id='type-id-1912'/>
     <class-decl name='FT_Outline_' size-in-bits='320' is-struct='yes' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='393' column='1' id='type-id-1924'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='n_contours' type-id='type-id-141' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='394' column='1'/>
+        <var-decl name='n_contours' type-id='type-id-142' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='394' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='n_points' type-id='type-id-141' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='395' column='1'/>
+        <var-decl name='n_points' type-id='type-id-142' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='points' type-id='type-id-1925' visibility='default' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='397' column='1'/>
@@ -24751,7 +24751,7 @@
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-1910' size-in-bits='64' id='type-id-1925'/>
-    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-1926'/>
+    <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-1926'/>
     <typedef-decl name='FT_Outline' type-id='type-id-1924' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/ftimage.h' line='403' column='1' id='type-id-1913'/>
     <class-decl name='FT_SubGlyphRec_' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-1927'/>
     <pointer-type-def type-id='type-id-1927' size-in-bits='64' id='type-id-1928'/>
@@ -24903,26 +24903,26 @@
     <pointer-type-def type-id='type-id-1965' size-in-bits='64' id='type-id-1966'/>
     <typedef-decl name='FT_Face_Internal' type-id='type-id-1966' filepath='/collab/usr/global/tools/order/spack/opt/chaos_5_x86_64_ib/gcc@4.4.7/freetype@2.5.3-77fab1b8/include/freetype2/freetype.h' line='810' column='1' id='type-id-1891'/>
     <function-decl name='hb_ft_font_get_face' mangled-name='hb_ft_font_get_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_get_face'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='515' column='1'/>
       <return type-id='type-id-1897'/>
     </function-decl>
     <function-decl name='hb_ft_font_set_funcs' mangled-name='hb_ft_font_set_funcs' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_set_funcs'>
-      <parameter type-id='type-id-157' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
+      <parameter type-id='type-id-158' name='font' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-font.cc' line='1035' column='1'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='hb_ft_face_create' mangled-name='hb_ft_face_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create'>
       <parameter type-id='type-id-1897' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='333' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='334' column='1'/>
-      <return type-id='type-id-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-decl name='hb_ft_font_create' mangled-name='hb_ft_font_create' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_font_create'>
       <parameter type-id='type-id-1897' name='ft_face' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='408' column='1'/>
       <parameter type-id='type-id-21' name='destroy' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='409' column='1'/>
-      <return type-id='type-id-157'/>
+      <return type-id='type-id-158'/>
     </function-decl>
     <function-decl name='hb_ft_face_create_cached' mangled-name='hb_ft_face_create_cached' filepath='/tmp/legendre/spack-stage/spack-stage-04g73E/harfbuzz-0.9.37/src/hb-ft.cc' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hb_ft_face_create_cached'>
       <parameter type-id='type-id-1897' 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-158'/>
+      <return type-id='type-id-159'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-1957'>
       <parameter type-id='type-id-1889'/>

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 cb8bbb5..066c842 100644 (file)
--- 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
@@ -6249,11 +6249,11 @@
     <qualified-type-def type-id='type-id-30' const='yes' id='type-id-45'/>
     <qualified-type-def type-id='type-id-192' const='yes' id='type-id-303'/>
 
-    <array-type-def dimensions='1' type-id='type-id-17' size-in-bits='4194304' id='type-id-307'>
+    <array-type-def dimensions='1' type-id='type-id-307' size-in-bits='4194304' id='type-id-304'>
       <subrange length='65536' type-id='type-id-17' id='type-id-308'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-307' volatile='yes' id='type-id-304'/>
+    <qualified-type-def type-id='type-id-17' volatile='yes' id='type-id-307'/>
     <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-305'/>
     <qualified-type-def type-id='type-id-249' const='yes' id='type-id-309'/>
     <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-306'/>

diff --git a/tests/data/test-read-dwarf/test21-pr19092.so.abi b/tests/data/test-read-dwarf/test21-pr19092.so.abi
index dcfab72..f3cf3e3 100644 (file)
--- a/tests/data/test-read-dwarf/test21-pr19092.so.abi
+++ b/tests/data/test-read-dwarf/test21-pr19092.so.abi
@@ -1491,6 +1491,8 @@
       <parameter type-id='type-id-4'/>
       <return type-id='type-id-9'/>
     </function-decl>
+    <qualified-type-def type-id='type-id-6' const='yes' id='type-id-144'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-145'/>
     <enum-decl name='node_type' filepath='../.././libcpp/include/cpplib.h' line='614' column='1' id='type-id-137'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='NT_VOID' value='0'/>
@@ -1557,7 +1559,7 @@
     </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-136'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='str' type-id='type-id-144' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
+        <var-decl name='str' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/symtab.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='len' type-id='type-id-35' visibility='default' filepath='../.././libcpp/include/symtab.h' line='34' column='1'/>
@@ -1568,22 +1570,22 @@
     </class-decl>
     <union-decl name='_cpp_hashnode_value' size-in-bits='64' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='665' column='1' id='type-id-138'>
       <data-member access='private'>
-        <var-decl name='macro' type-id='type-id-145' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
+        <var-decl name='macro' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='667' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='answers' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
+        <var-decl name='answers' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='669' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='builtin' type-id='type-id-147' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
+        <var-decl name='builtin' type-id='type-id-149' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='671' column='1'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='arg_index' type-id='type-id-14' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='673' column='1'/>
       </data-member>
     </union-decl>
-    <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-146'/>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-144'/>
-    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-145'/>
-    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-147'>
+    <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-148'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-146'/>
+    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-147'/>
+    <enum-decl name='cpp_builtin_type' filepath='../.././libcpp/include/cpplib.h' line='623' column='1' id='type-id-149'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='BT_SPECLINE' value='0'/>
       <enumerator name='BT_DATE' value='1'/>
@@ -1598,39 +1600,39 @@
       <enumerator name='BT_FIRST_USER' value='10'/>
       <enumerator name='BT_LAST_USER' value='41'/>
     </enum-decl>
-    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-149'/>
-    <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-148'>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-151'/>
+    <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-150'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
+        <var-decl name='next' type-id='type-id-148' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='29' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='count' type-id='type-id-35' 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-151' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
+        <var-decl name='first' type-id='type-id-153' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='31' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_macro' type-id='type-id-152' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-150'/>
-    <array-type-def dimensions='1' type-id='type-id-153' size-in-bits='192' id='type-id-151'>
+    <typedef-decl name='cpp_macro' type-id='type-id-154' filepath='../.././libcpp/include/cpplib.h' line='37' column='1' id='type-id-152'/>
+    <array-type-def dimensions='1' type-id='type-id-155' size-in-bits='192' id='type-id-153'>
       <subrange length='1' type-id='type-id-22' id='type-id-23'/>
 
     </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-152'>
+    <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-154'>
       <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-154'>
+        <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-156'>
           <data-member access='private'>
-            <var-decl name='tokens' type-id='type-id-155' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='49' column='1'/>
+            <var-decl name='tokens' type-id='type-id-157' 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-144' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
+            <var-decl name='text' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='50' column='1'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='params' type-id='type-id-156' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='42' column='1'/>
+        <var-decl name='params' type-id='type-id-158' 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-154' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='51' column='1'/>
+        <var-decl name='exp' type-id='type-id-156' 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-106' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='54' column='1'/>
@@ -1660,22 +1662,22 @@
         <var-decl name='extra_tokens' type-id='type-id-35' visibility='default' filepath='../.././libcpp/include/cpp-id-data.h' line='80' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-156'/>
-    <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-155'/>
-    <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-153'>
+    <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-158'/>
+    <pointer-type-def type-id='type-id-155' size-in-bits='64' id='type-id-157'/>
+    <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-155'>
       <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-157'>
+        <union-decl name='cpp_token_u' size-in-bits='128' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='228' column='1' id='type-id-159'>
           <data-member access='private'>
-            <var-decl name='node' type-id='type-id-158' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='231' column='1'/>
+            <var-decl name='node' type-id='type-id-160' 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-155' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='234' column='1'/>
+            <var-decl name='source' type-id='type-id-157' 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-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='237' column='1'/>
+            <var-decl name='str' type-id='type-id-161' 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-160' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='240' column='1'/>
+            <var-decl name='macro_arg' type-id='type-id-162' 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-35' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='244' column='1'/>
@@ -1689,16 +1691,16 @@
         <var-decl name='src_loc' type-id='type-id-106' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='224' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='type' type-id='type-id-161' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='225' column='1'/>
+        <var-decl name='type' type-id='type-id-163' 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-14' 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-157' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
+        <var-decl name='val' type-id='type-id-159' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='248' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-161'>
+    <enum-decl name='cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='153' column='1' id='type-id-163'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='CPP_EQ' value='0'/>
       <enumerator name='CPP_NOT' value='1'/>
@@ -1788,22 +1790,22 @@
       <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-158'>
+    <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-160'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='node' type-id='type-id-133' 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-160'>
+    <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-162'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='arg_no' type-id='type-id-35' 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-159'>
+    <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-161'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='len' type-id='type-id-35' 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-144' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
+        <var-decl name='text' type-id='type-id-146' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='175' column='1'/>
       </data-member>
     </class-decl>
   </abi-instr>
@@ -1823,20 +1825,20 @@
   <abi-instr version='1.0' address-size='64' path='../.././gcc/tlink.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'>
 
     <var-decl name='symbol_stack_obstack' type-id='type-id-31' mangled-name='symbol_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='193' column='1' elf-symbol-id='symbol_stack_obstack'/>
-    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-162'>
+    <class-decl name='symbol_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='188' column='1' id='type-id-164'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='value' type-id='type-id-163' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
+        <var-decl name='value' type-id='type-id-165' visibility='default' filepath='../.././gcc/tlink.c' line='190' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-164' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
+        <var-decl name='next' type-id='type-id-166' visibility='default' filepath='../.././gcc/tlink.c' line='191' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-165'>
+    <class-decl name='symbol_hash_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='53' column='1' id='type-id-167'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key' type-id='type-id-8' visibility='default' filepath='../.././gcc/tlink.c' line='55' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='file' type-id='type-id-166' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
+        <var-decl name='file' type-id='type-id-168' visibility='default' filepath='../.././gcc/tlink.c' line='56' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='chosen' type-id='type-id-3' visibility='default' filepath='../.././gcc/tlink.c' line='57' column='1'/>
@@ -1848,7 +1850,7 @@
         <var-decl name='tweaked' type-id='type-id-3' visibility='default' filepath='../.././gcc/tlink.c' line='59' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-167'>
+    <class-decl name='file_hash_entry' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='62' column='1' id='type-id-169'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='key' type-id='type-id-8' visibility='default' filepath='../.././gcc/tlink.c' line='64' column='1'/>
       </data-member>
@@ -1865,38 +1867,38 @@
         <var-decl name='tweaking' type-id='type-id-3' visibility='default' filepath='../.././gcc/tlink.c' line='68' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-166'/>
-    <typedef-decl name='symbol' type-id='type-id-165' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-163'/>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-164'/>
-    <var-decl name='symbol_stack' type-id='type-id-164' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
+    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-168'/>
+    <typedef-decl name='symbol' type-id='type-id-167' filepath='../.././gcc/tlink.c' line='60' column='1' id='type-id-170'/>
+    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-166'/>
+    <var-decl name='symbol_stack' type-id='type-id-166' mangled-name='symbol_stack' visibility='default' filepath='../.././gcc/tlink.c' line='194' column='1' elf-symbol-id='symbol_stack'/>
     <var-decl name='file_stack_obstack' type-id='type-id-31' mangled-name='file_stack_obstack' visibility='default' filepath='../.././gcc/tlink.c' line='201' column='1' elf-symbol-id='file_stack_obstack'/>
-    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-169'>
+    <class-decl name='file_stack_entry' size-in-bits='128' is-struct='yes' visibility='default' filepath='../.././gcc/tlink.c' line='196' column='1' id='type-id-171'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='value' type-id='type-id-170' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
+        <var-decl name='value' type-id='type-id-172' visibility='default' filepath='../.././gcc/tlink.c' line='198' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='next' type-id='type-id-171' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
+        <var-decl name='next' type-id='type-id-173' visibility='default' filepath='../.././gcc/tlink.c' line='199' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='file' type-id='type-id-167' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-172'/>
-    <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-170'/>
-    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-171'/>
-    <var-decl name='file_stack' type-id='type-id-171' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
-    <typedef-decl name='hashval_t' type-id='type-id-35' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-173'/>
+    <typedef-decl name='file' type-id='type-id-169' filepath='../.././gcc/tlink.c' line='69' column='1' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-172'/>
+    <pointer-type-def type-id='type-id-171' size-in-bits='64' id='type-id-173'/>
+    <var-decl name='file_stack' type-id='type-id-173' mangled-name='file_stack' visibility='default' filepath='../.././gcc/tlink.c' line='202' column='1' elf-symbol-id='file_stack'/>
+    <typedef-decl name='hashval_t' type-id='type-id-35' filepath='../.././gcc/../include/hashtab.h' line='47' column='1' id='type-id-175'/>
     <function-decl name='htab_hash_string' filepath='../.././gcc/../include/hashtab.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-175'/>
     </function-decl>
-    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/hashtab.h' line='100' column='1' id='type-id-174'>
+    <class-decl name='htab' size-in-bits='896' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/hashtab.h' line='100' column='1' id='type-id-176'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='hash_f' type-id='type-id-175' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
+        <var-decl name='hash_f' type-id='type-id-177' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='eq_f' type-id='type-id-176' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
+        <var-decl name='eq_f' type-id='type-id-178' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='105' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='del_f' type-id='type-id-177' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
+        <var-decl name='del_f' type-id='type-id-179' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='entries' type-id='type-id-102' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='111' column='1'/>
@@ -1917,48 +1919,48 @@
         <var-decl name='collisions' type-id='type-id-35' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='128' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='alloc_f' type-id='type-id-178' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
+        <var-decl name='alloc_f' type-id='type-id-180' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='131' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_f' type-id='type-id-179' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
+        <var-decl name='free_f' type-id='type-id-181' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='alloc_arg' type-id='type-id-2' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='135' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='alloc_with_arg_f' type-id='type-id-180' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
+        <var-decl name='alloc_with_arg_f' type-id='type-id-182' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='136' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='free_with_arg_f' type-id='type-id-181' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
+        <var-decl name='free_with_arg_f' type-id='type-id-183' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='137' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='size_prime_index' type-id='type-id-35' visibility='default' filepath='../.././gcc/../include/hashtab.h' line='141' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
-    <typedef-decl name='htab_hash' type-id='type-id-183' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-175'/>
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
-    <typedef-decl name='htab_eq' type-id='type-id-185' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-176'/>
-    <typedef-decl name='htab_del' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-177'/>
+    <typedef-decl name='htab_hash' type-id='type-id-185' filepath='../.././gcc/../include/hashtab.h' line='52' column='1' id='type-id-177'/>
     <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-187'/>
-    <typedef-decl name='htab_alloc' type-id='type-id-187' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-178'/>
-    <typedef-decl name='htab_free' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-179'/>
+    <typedef-decl name='htab_eq' type-id='type-id-187' filepath='../.././gcc/../include/hashtab.h' line='59' column='1' id='type-id-178'/>
+    <typedef-decl name='htab_del' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='63' column='1' id='type-id-179'/>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
-    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-189' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-180'/>
+    <typedef-decl name='htab_alloc' type-id='type-id-189' filepath='../.././gcc/../include/hashtab.h' line='75' column='1' id='type-id-180'/>
+    <typedef-decl name='htab_free' type-id='type-id-143' filepath='../.././gcc/../include/hashtab.h' line='78' column='1' id='type-id-181'/>
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <typedef-decl name='htab_free_with_arg' type-id='type-id-191' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-181'/>
-    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-192'/>
-    <typedef-decl name='htab_t' type-id='type-id-192' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-193'/>
-    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-194'>
+    <typedef-decl name='htab_alloc_with_arg' type-id='type-id-191' filepath='../.././gcc/../include/hashtab.h' line='82' column='1' id='type-id-182'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
+    <typedef-decl name='htab_free_with_arg' type-id='type-id-193' filepath='../.././gcc/../include/hashtab.h' line='83' column='1' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-194'/>
+    <typedef-decl name='htab_t' type-id='type-id-194' filepath='../.././gcc/../include/hashtab.h' line='144' column='1' id='type-id-195'/>
+    <enum-decl name='insert_option' filepath='../.././gcc/../include/hashtab.h' line='147' column='1' id='type-id-196'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='NO_INSERT' value='0'/>
       <enumerator name='INSERT' value='1'/>
     </enum-decl>
     <function-decl name='htab_find_slot_with_hash' filepath='../.././gcc/../include/hashtab.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-173'/>
-      <parameter type-id='type-id-194'/>
+      <parameter type-id='type-id-175'/>
+      <parameter type-id='type-id-196'/>
       <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='fscanf' filepath='/usr/include/stdio.h' line='429' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -1986,10 +1988,10 @@
     </function-decl>
     <function-decl name='htab_create' filepath='../.././gcc/../include/hashtab.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-175'/>
-      <parameter type-id='type-id-176'/>
       <parameter type-id='type-id-177'/>
-      <return type-id='type-id-193'/>
+      <parameter type-id='type-id-178'/>
+      <parameter type-id='type-id-179'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='getpwd' filepath='../.././gcc/../include/libiberty.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-9'/>
@@ -2004,26 +2006,26 @@
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-184'>
+    <function-type size-in-bits='64' id='type-id-186'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-182'>
+    <function-type size-in-bits='64' id='type-id-184'>
       <parameter type-id='type-id-2'/>
-      <return type-id='type-id-173'/>
+      <return type-id='type-id-175'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-190'>
+    <function-type size-in-bits='64' id='type-id-192'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-186'>
+    <function-type size-in-bits='64' id='type-id-188'>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-2'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-188'>
+    <function-type size-in-bits='64' id='type-id-190'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-5'/>
@@ -2132,7 +2134,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/ggc-none.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'>
 
-    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-195'>
+    <enum-decl name='gt_types_enum' filepath='./gtype-desc.h' line='23' column='1' id='type-id-197'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='gt_ggc_e_24lazy_hex_fp_value_struct' value='0'/>
       <enumerator name='gt_ggc_e_15c_inline_static' value='1'/>
@@ -2811,7 +2813,7 @@
       <enumerator name='gt_types_enum_last' value='674'/>
     </enum-decl>
     <function-decl name='ggc_alloc_typed_stat' mangled-name='_Z20ggc_alloc_typed_stat13gt_types_enumm' filepath='../.././gcc/ggc-none.c' line='36' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20ggc_alloc_typed_stat13gt_types_enumm'>
-      <parameter type-id='type-id-195' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
+      <parameter type-id='type-id-197' name='gte' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <parameter type-id='type-id-5' name='size' filepath='../.././gcc/ggc-none.c' line='36' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
@@ -2823,14 +2825,14 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-196'>
+    <class-decl name='alloc_zone' size-in-bits='32' is-struct='yes' visibility='default' filepath='../.././gcc/ggc-none.c' line='75' column='1' id='type-id-198'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dummy' type-id='type-id-3' visibility='default' filepath='../.././gcc/ggc-none.c' line='77' column='1'/>
       </data-member>
     </class-decl>
-    <var-decl name='rtl_zone' type-id='type-id-196' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
-    <var-decl name='tree_zone' type-id='type-id-196' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
-    <var-decl name='tree_id_zone' type-id='type-id-196' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
+    <var-decl name='rtl_zone' type-id='type-id-198' mangled-name='rtl_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='80' column='1' elf-symbol-id='rtl_zone'/>
+    <var-decl name='tree_zone' type-id='type-id-198' mangled-name='tree_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='81' column='1' elf-symbol-id='tree_zone'/>
+    <var-decl name='tree_id_zone' type-id='type-id-198' mangled-name='tree_id_zone' visibility='default' filepath='../.././gcc/ggc-none.c' line='82' column='1' elf-symbol-id='tree_id_zone'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
 
@@ -3018,12 +3020,12 @@
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <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-197'>
+    <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-199'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='info_ordinary' type-id='type-id-198' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
+        <var-decl name='info_ordinary' type-id='type-id-200' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='265' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='info_macro' type-id='type-id-198' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
+        <var-decl name='info_macro' type-id='type-id-200' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='267' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='depth' type-id='type-id-35' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='270' column='1'/>
@@ -3041,15 +3043,15 @@
         <var-decl name='max_column_hint' type-id='type-id-35' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='283' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='reallocator' type-id='type-id-199' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
+        <var-decl name='reallocator' type-id='type-id-201' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='round_alloc_size' type-id='type-id-200' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
+        <var-decl name='round_alloc_size' type-id='type-id-202' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='291' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-198'>
+    <class-decl name='maps_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='244' column='1' id='type-id-200'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='maps' type-id='type-id-201' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
+        <var-decl name='maps' type-id='type-id-203' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='250' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='allocated' type-id='type-id-35' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='253' column='1'/>
@@ -3061,31 +3063,31 @@
         <var-decl name='cache' type-id='type-id-35' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='259' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
-    <typedef-decl name='line_map_realloc' type-id='type-id-203' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-199'/>
+    <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-203'/>
     <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
-    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-205' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-200'/>
-    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-206'/>
-    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-207'>
+    <typedef-decl name='line_map_realloc' type-id='type-id-205' filepath='../.././gcc/../libcpp/include/line-map.h' line='54' column='1' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
+    <typedef-decl name='line_map_round_alloc_size_func' type-id='type-id-207' filepath='../.././gcc/../libcpp/include/line-map.h' line='58' column='1' id='type-id-202'/>
+    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-208'/>
+    <enum-decl name='location_resolution_kind' filepath='../.././gcc/../libcpp/include/line-map.h' line='604' column='1' id='type-id-209'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='LRK_MACRO_EXPANSION_POINT' value='0'/>
       <enumerator name='LRK_SPELLING_LOCATION' value='1'/>
       <enumerator name='LRK_MACRO_DEFINITION_LOCATION' value='2'/>
     </enum-decl>
-    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-208'/>
+    <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-210'/>
     <function-decl name='linemap_resolve_location' mangled-name='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map' filepath='../.././gcc/../libcpp/include/line-map.h' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24linemap_resolve_locationP9line_mapsj24location_resolution_kindPPK8line_map'>
-      <parameter type-id='type-id-206'/>
-      <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-207'/>
       <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-106'/>
+      <parameter type-id='type-id-209'/>
+      <parameter type-id='type-id-210'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='pp_base_newline' mangled-name='_Z15pp_base_newlineP17pretty_print_info' filepath='../.././gcc/pretty-print.h' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15pp_base_newlineP17pretty_print_info'>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/pretty-print.h' line='34' column='1' id='type-id-209'>
+    <class-decl name='__anonymous_struct__' size-in-bits='320' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/pretty-print.h' line='34' column='1' id='type-id-211'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='format_spec' type-id='type-id-8' visibility='default' filepath='../.././gcc/pretty-print.h' line='35' column='1'/>
       </data-member>
@@ -3111,12 +3113,12 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='linemap_compare_locations' mangled-name='_Z25linemap_compare_locationsP9line_mapsjj' filepath='../.././gcc/../libcpp/include/line-map.h' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25linemap_compare_locationsP9line_mapsjj'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-106'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-210' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-211'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-212' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-213'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='file' type-id='type-id-8' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
       </data-member>
@@ -3130,10 +3132,10 @@
         <var-decl name='sysp' type-id='type-id-41' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='598' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='expanded_location' type-id='type-id-211' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-210'/>
+    <typedef-decl name='expanded_location' type-id='type-id-213' filepath='../.././gcc/../libcpp/include/line-map.h' line='599' column='1' id='type-id-212'/>
     <function-decl name='expand_location' mangled-name='_Z15expand_locationj' filepath='../.././gcc/input.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15expand_locationj'>
       <parameter type-id='type-id-106'/>
-      <return type-id='type-id-210'/>
+      <return type-id='type-id-212'/>
     </function-decl>
     <function-decl name='concat_length' filepath='../.././gcc/../include/libiberty.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
@@ -3155,7 +3157,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='linemap_location_in_system_header_p' mangled-name='_Z35linemap_location_in_system_header_pP9line_mapsj' filepath='../.././gcc/../libcpp/include/line-map.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z35linemap_location_in_system_header_pP9line_mapsj'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-106'/>
       <return type-id='type-id-3'/>
     </function-decl>
@@ -3164,11 +3166,11 @@
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-204'>
+    <function-type size-in-bits='64' id='type-id-206'>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-202'>
+    <function-type size-in-bits='64' id='type-id-204'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-2'/>
@@ -3193,10 +3195,10 @@
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-212'/>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
+    <qualified-type-def type-id='type-id-97' const='yes' id='type-id-214'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
     <function-decl name='pp_base_last_position_in_text' mangled-name='_Z29pp_base_last_position_in_textPK17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z29pp_base_last_position_in_textPK17pretty_print_info'>
-      <parameter type-id='type-id-213' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
+      <parameter type-id='type-id-215' name='pp' filepath='../.././gcc/pretty-print.c' line='702' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='pp_base_remaining_character_count_for_line' mangled-name='_Z42pp_base_remaining_character_count_for_lineP17pretty_print_info' filepath='../.././gcc/pretty-print.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z42pp_base_remaining_character_count_for_lineP17pretty_print_info'>
@@ -3241,8 +3243,8 @@
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
-    <var-decl name='identifier_to_locale_alloc' type-id='type-id-215' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
+    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-217'/>
+    <var-decl name='identifier_to_locale_alloc' type-id='type-id-217' mangled-name='identifier_to_locale_alloc' visibility='default' filepath='../.././gcc/pretty-print.c' line='859' column='1' elf-symbol-id='identifier_to_locale_alloc'/>
     <var-decl name='identifier_to_locale_free' type-id='type-id-143' mangled-name='identifier_to_locale_free' visibility='default' filepath='../.././gcc/pretty-print.c' line='860' column='1' elf-symbol-id='identifier_to_locale_free'/>
     <function-decl name='xstrerror' filepath='../.././gcc/../include/libiberty.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
@@ -3260,26 +3262,26 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <typedef-decl name='iconv_t' type-id='type-id-2' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-216'/>
-    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-217'/>
+    <typedef-decl name='iconv_t' type-id='type-id-2' filepath='/usr/include/iconv.h' line='30' column='1' id='type-id-218'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-219'/>
     <function-decl name='iconv' filepath='/usr/include/iconv.h' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-216'/>
+      <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-219'/>
       <parameter type-id='type-id-30'/>
-      <parameter type-id='type-id-217'/>
+      <parameter type-id='type-id-219'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='iconv_close' filepath='/usr/include/iconv.h' line='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-216'/>
+      <parameter type-id='type-id-218'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='iconv_open' filepath='/usr/include/iconv.h' line='38' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-216'/>
+      <return type-id='type-id-218'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-214'>
+    <function-type size-in-bits='64' id='type-id-216'>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-2'/>
     </function-type>
@@ -3312,9 +3314,9 @@
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <typedef-decl name='nl_item' type-id='type-id-3' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-218'/>
+    <typedef-decl name='nl_item' type-id='type-id-3' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-220'/>
     <function-decl name='nl_langinfo' filepath='/usr/include/langinfo.h' line='584' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-218'/>
+      <parameter type-id='type-id-220'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='strcasecmp' filepath='/usr/include/string.h' line='536' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -3322,18 +3324,18 @@
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <type-decl name='wchar_t' size-in-bits='32' id='type-id-219'/>
-    <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-220'/>
+    <type-decl name='wchar_t' size-in-bits='32' id='type-id-221'/>
+    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
     <function-decl name='mbstowcs' filepath='/usr/include/stdlib.h' line='871' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-220'/>
+      <parameter type-id='type-id-222'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-221'/>
-    <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-222'/>
+    <qualified-type-def type-id='type-id-221' const='yes' id='type-id-223'/>
+    <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-224'/>
     <function-decl name='wcswidth' filepath='/usr/include/wchar.h' line='441' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-222'/>
+      <parameter type-id='type-id-224'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-3'/>
     </function-decl>
@@ -3349,9 +3351,9 @@
     <function-decl name='dump_line_table_statistics' mangled-name='_Z26dump_line_table_statisticsv' filepath='../.././gcc/input.c' line='83' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26dump_line_table_statisticsv'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <var-decl name='line_table' type-id='type-id-206' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
+    <var-decl name='line_table' type-id='type-id-208' mangled-name='line_table' visibility='default' filepath='../.././gcc/input.c' line='31' column='1' elf-symbol-id='line_table'/>
     <var-decl name='input_location' type-id='type-id-107' mangled-name='input_location' visibility='default' filepath='../.././gcc/input.c' line='29' column='1' elf-symbol-id='input_location'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-223'>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='588' column='1' id='type-id-225'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='file' type-id='type-id-8' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='590' column='1'/>
       </data-member>
@@ -3366,12 +3368,12 @@
       </data-member>
     </class-decl>
     <function-decl name='linemap_expand_location' mangled-name='_Z23linemap_expand_locationP9line_mapsPK8line_mapj' filepath='../.././gcc/../libcpp/include/line-map.h' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23linemap_expand_locationP9line_mapsPK8line_mapj'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-78'/>
       <parameter type-id='type-id-106'/>
-      <return type-id='type-id-210'/>
+      <return type-id='type-id-212'/>
     </function-decl>
-    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-224'>
+    <class-decl name='linemap_stats' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='685' column='1' id='type-id-226'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='num_ordinary_maps_allocated' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='687' column='1'/>
       </data-member>
@@ -3406,47 +3408,44 @@
         <var-decl name='duplicated_macro_maps_locations_size' type-id='type-id-21' visibility='default' filepath='../.././gcc/../libcpp/include/line-map.h' line='697' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-225'/>
+    <pointer-type-def type-id='type-id-226' size-in-bits='64' id='type-id-227'/>
     <function-decl name='linemap_get_statistics' mangled-name='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats' filepath='../.././gcc/../libcpp/include/line-map.h' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22linemap_get_statisticsP9line_mapsP13linemap_stats'>
-      <parameter type-id='type-id-206'/>
-      <parameter type-id='type-id-225'/>
+      <parameter type-id='type-id-208'/>
+      <parameter type-id='type-id-227'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././gcc/version.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'>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='48' id='type-id-226'>
-      <subrange length='6' type-id='type-id-22' id='type-id-227'/>
+    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='48' id='type-id-228'>
+      <subrange length='6' type-id='type-id-22' id='type-id-229'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-226' const='yes' id='type-id-228'/>
     <var-decl name='version_string' type-id='type-id-228' mangled-name='version_string' visibility='default' filepath='../.././gcc/version.c' line='35' column='1' elf-symbol-id='version_string'/>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='56' id='type-id-229'>
-      <subrange length='7' type-id='type-id-22' id='type-id-230'/>
+    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='56' id='type-id-230'>
+      <subrange length='7' type-id='type-id-22' id='type-id-231'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-231'/>
-    <var-decl name='pkgversion_string' type-id='type-id-231' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
+    <var-decl name='pkgversion_string' type-id='type-id-230' mangled-name='pkgversion_string' visibility='default' filepath='../.././gcc/version.c' line='36' column='1' elf-symbol-id='pkgversion_string'/>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='248' id='type-id-232'>
+    <array-type-def dimensions='1' type-id='type-id-144' size-in-bits='248' id='type-id-232'>
       <subrange length='31' type-id='type-id-22' id='type-id-233'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-232' const='yes' id='type-id-234'/>
-    <var-decl name='bug_report_url' type-id='type-id-234' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
+    <var-decl name='bug_report_url' type-id='type-id-232' mangled-name='bug_report_url' visibility='default' filepath='../.././gcc/version.c' line='29' column='1' elf-symbol-id='bug_report_url'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <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-206' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='linemap_check_files_exited' mangled-name='_Z26linemap_check_files_exitedP9line_maps' filepath='../.././libcpp/line-map.c' line='66' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z26linemap_check_files_exitedP9line_maps'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='56' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='linemap_add' mangled-name='_Z11linemap_addP9line_maps9lc_reasonjPKcj' filepath='../.././libcpp/line-map.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11linemap_addP9line_maps9lc_reasonjPKcj'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <parameter type-id='type-id-130' name='reason' filepath='../.././libcpp/line-map.c' line='163' column='1'/>
       <parameter type-id='type-id-35' name='sysp' filepath='../.././libcpp/line-map.c' line='164' column='1'/>
       <parameter type-id='type-id-8' name='to_file' filepath='../.././libcpp/line-map.c' line='164' column='1'/>
@@ -3454,14 +3453,14 @@
       <return type-id='type-id-78'/>
     </function-decl>
     <function-decl name='linemap_tracks_macro_expansion_locs_p' mangled-name='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps' filepath='../.././libcpp/line-map.c' line='276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z37linemap_tracks_macro_expansion_locs_pP9line_maps'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='276' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
-    <typedef-decl name='cpp_hashnode' type-id='type-id-135' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-235'/>
-    <typedef-decl name='cpp_token' type-id='type-id-153' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-236'/>
+    <typedef-decl name='cpp_hashnode' type-id='type-id-135' filepath='../.././libcpp/include/cpplib.h' line='36' column='1' id='type-id-234'/>
+    <typedef-decl name='cpp_token' type-id='type-id-155' filepath='../.././libcpp/include/cpplib.h' line='34' column='1' id='type-id-235'/>
 
     <function-decl name='linemap_enter_macro' mangled-name='linemap_enter_macro' filepath='../.././libcpp/line-map.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_enter_macro'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <parameter type-id='type-id-133' name='macro_node' filepath='../.././libcpp/line-map.c' line='305' column='1'/>
       <parameter type-id='type-id-106' name='expansion' filepath='../.././libcpp/line-map.c' line='306' column='1'/>
       <parameter type-id='type-id-35' name='num_tokens' filepath='../.././libcpp/line-map.c' line='306' column='1'/>
@@ -3475,24 +3474,24 @@
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='linemap_line_start' mangled-name='_Z18linemap_line_startP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18linemap_line_startP9line_mapsjj'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <parameter type-id='type-id-131' name='to_line' filepath='../.././libcpp/line-map.c' line='387' column='1'/>
       <parameter type-id='type-id-35' name='max_column_hint' filepath='../.././libcpp/line-map.c' line='388' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='linemap_position_for_column' mangled-name='_Z27linemap_position_for_columnP9line_mapsj' filepath='../.././libcpp/line-map.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27linemap_position_for_columnP9line_mapsj'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <parameter type-id='type-id-35' name='to_column' filepath='../.././libcpp/line-map.c' line='465' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='linemap_position_for_line_and_column' mangled-name='_Z36linemap_position_for_line_and_columnP8line_mapjj' filepath='../.././libcpp/line-map.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z36linemap_position_for_line_and_columnP8line_mapjj'>
-      <parameter type-id='type-id-201' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
+      <parameter type-id='type-id-203' name='map' filepath='../.././libcpp/line-map.c' line='495' column='1'/>
       <parameter type-id='type-id-131' name='line' filepath='../.././libcpp/line-map.c' line='496' column='1'/>
       <parameter type-id='type-id-35' name='column' filepath='../.././libcpp/line-map.c' line='497' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='linemap_lookup' mangled-name='_Z14linemap_lookupP9line_mapsj' filepath='../.././libcpp/line-map.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14linemap_lookupP9line_mapsj'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <parameter type-id='type-id-106' name='line' filepath='../.././libcpp/line-map.c' line='511' column='1'/>
       <return type-id='type-id-78'/>
     </function-decl>
@@ -3501,12 +3500,12 @@
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='linemap_get_expansion_line' mangled-name='linemap_get_expansion_line' filepath='../.././libcpp/line-map.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_line'>
-      <parameter type-id='type-id-206'/>
+      <parameter type-id='type-id-208'/>
       <parameter type-id='type-id-106'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='linemap_get_expansion_filename' mangled-name='linemap_get_expansion_filename' filepath='../.././libcpp/line-map.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='linemap_get_expansion_filename'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='719' column='1'/>
       <parameter type-id='type-id-106' name='location' filepath='../.././libcpp/line-map.c' line='720' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
@@ -3515,32 +3514,32 @@
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='linemap_location_from_macro_expansion_p' mangled-name='_Z39linemap_location_from_macro_expansion_pP9line_mapsj' filepath='../.././libcpp/line-map.c' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z39linemap_location_from_macro_expansion_pP9line_mapsj'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='772' column='1'/>
       <parameter type-id='type-id-106' name='location' filepath='../.././libcpp/line-map.c' line='773' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='linemap_unwind_toward_expansion' mangled-name='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map' filepath='../.././libcpp/line-map.c' line='1093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z31linemap_unwind_toward_expansionP9line_mapsjPPK8line_map'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1093' column='1'/>
       <parameter type-id='type-id-106' name='loc' filepath='../.././libcpp/line-map.c' line='1094' column='1'/>
-      <parameter type-id='type-id-208' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
+      <parameter type-id='type-id-210' name='map' filepath='../.././libcpp/line-map.c' line='1095' column='1'/>
       <return type-id='type-id-106'/>
     </function-decl>
     <function-decl name='linemap_dump' mangled-name='_Z12linemap_dumpP8_IO_FILEP9line_mapsjb' filepath='../.././libcpp/line-map.c' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12linemap_dumpP8_IO_FILEP9line_mapsjb'>
       <parameter type-id='type-id-27' name='stream' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <parameter type-id='type-id-35' name='ix' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <parameter type-id='type-id-41' name='is_macro' filepath='../.././libcpp/line-map.c' line='1162' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='linemap_dump_location' mangled-name='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE' filepath='../.././libcpp/line-map.c' line='1211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21linemap_dump_locationP9line_mapsjP8_IO_FILE'>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1211' column='1'/>
       <parameter type-id='type-id-106' name='loc' filepath='../.././libcpp/line-map.c' line='1212' column='1'/>
       <parameter type-id='type-id-27' name='stream' filepath='../.././libcpp/line-map.c' line='1213' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='line_table_dump' mangled-name='_Z15line_table_dumpP8_IO_FILEP9line_mapsjj' filepath='../.././libcpp/line-map.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15line_table_dumpP8_IO_FILEP9line_mapsjj'>
       <parameter type-id='type-id-27' name='stream' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
-      <parameter type-id='type-id-206' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
+      <parameter type-id='type-id-208' name='set' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <parameter type-id='type-id-35' name='num_ordinary' filepath='../.././libcpp/line-map.c' line='1315' column='1'/>
       <parameter type-id='type-id-35' name='num_macro' filepath='../.././libcpp/line-map.c' line='1316' column='1'/>
       <return type-id='type-id-1'/>
@@ -3552,17 +3551,17 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/macro.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'>
-    <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-237'>
+    <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-236'>
       <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-238'>
+        <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-237'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='base' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
+            <var-decl name='base' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='529' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='limit' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
+            <var-decl name='limit' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='530' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='cur' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
+            <var-decl name='cur' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='531' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='192'>
             <var-decl name='first_line' type-id='type-id-106' visibility='default' filepath='../.././libcpp/internal.h' line='532' column='1'/>
@@ -3570,40 +3569,40 @@
         </class-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buffer' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
+        <var-decl name='buffer' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='383' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overlaid_buffer' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
+        <var-decl name='overlaid_buffer' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='386' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='state' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
+        <var-decl name='state' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='389' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='line_table' type-id='type-id-206' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
+        <var-decl name='line_table' type-id='type-id-208' visibility='default' filepath='../.././libcpp/internal.h' line='392' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='directive_line' type-id='type-id-106' visibility='default' filepath='../.././libcpp/internal.h' line='395' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='a_buff' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
+        <var-decl name='a_buff' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='398' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='u_buff' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
+        <var-decl name='u_buff' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='399' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='free_buffs' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
+        <var-decl name='free_buffs' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='400' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='base_context' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
+        <var-decl name='base_context' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='403' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='context' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
+        <var-decl name='context' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='404' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='directive' type-id='type-id-245' visibility='default' filepath='../.././libcpp/internal.h' line='407' column='1'/>
+        <var-decl name='directive' type-id='type-id-244' 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-236' visibility='default' filepath='../.././libcpp/internal.h' line='410' column='1'/>
+        <var-decl name='directive_result' type-id='type-id-235' 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-106' visibility='default' filepath='../.././libcpp/internal.h' line='414' column='1'/>
@@ -3612,31 +3611,31 @@
         <var-decl name='set_invocation_location' type-id='type-id-41' visibility='default' filepath='../.././libcpp/internal.h' line='418' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='quote_include' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
+        <var-decl name='quote_include' type-id='type-id-245' visibility='default' filepath='../.././libcpp/internal.h' line='421' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='bracket_include' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
+        <var-decl name='bracket_include' type-id='type-id-245' visibility='default' filepath='../.././libcpp/internal.h' line='422' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='no_search_path' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
+        <var-decl name='no_search_path' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='423' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2112'>
-        <var-decl name='all_files' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
+        <var-decl name='all_files' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='426' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='main_file' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
+        <var-decl name='main_file' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='428' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
-        <var-decl name='file_hash' type-id='type-id-192' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
+        <var-decl name='file_hash' type-id='type-id-194' visibility='default' filepath='../.././libcpp/internal.h' line='431' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='dir_hash' type-id='type-id-192' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
+        <var-decl name='dir_hash' type-id='type-id-194' visibility='default' filepath='../.././libcpp/internal.h' line='432' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2368'>
-        <var-decl name='file_hash_entries' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
+        <var-decl name='file_hash_entries' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='433' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='nonexistent_file_hash' type-id='type-id-192' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
+        <var-decl name='nonexistent_file_hash' type-id='type-id-194' visibility='default' filepath='../.././libcpp/internal.h' line='436' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2496'>
         <var-decl name='nonexistent_file_ob' type-id='type-id-31' visibility='default' filepath='../.././libcpp/internal.h' line='437' column='1'/>
@@ -3648,22 +3647,22 @@
         <var-decl name='seen_once_only' type-id='type-id-41' visibility='default' filepath='../.././libcpp/internal.h' line='445' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3264'>
-        <var-decl name='mi_cmacro' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
+        <var-decl name='mi_cmacro' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='448' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='mi_ind_cmacro' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
+        <var-decl name='mi_ind_cmacro' type-id='type-id-249' visibility='default' filepath='../.././libcpp/internal.h' line='449' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3392'>
         <var-decl name='mi_valid' type-id='type-id-41' 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-155' visibility='default' filepath='../.././libcpp/internal.h' line='453' column='1'/>
+        <var-decl name='cur_token' type-id='type-id-157' 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-251' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='base_run' type-id='type-id-250' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3776'>
-        <var-decl name='cur_run' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
+        <var-decl name='cur_run' type-id='type-id-251' visibility='default' filepath='../.././libcpp/internal.h' line='454' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3840'>
         <var-decl name='lookaheads' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='455' column='1'/>
@@ -3672,40 +3671,40 @@
         <var-decl name='keep_tokens' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='458' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3904'>
-        <var-decl name='macro_buffer' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
+        <var-decl name='macro_buffer' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3968'>
         <var-decl name='macro_buffer_len' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='462' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4032'>
-        <var-decl name='narrow_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
+        <var-decl name='narrow_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='466' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4224'>
-        <var-decl name='utf8_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
+        <var-decl name='utf8_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4416'>
-        <var-decl name='char16_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
+        <var-decl name='char16_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='474' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4608'>
-        <var-decl name='char32_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
+        <var-decl name='char32_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='478' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4800'>
-        <var-decl name='wide_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
+        <var-decl name='wide_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='482' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='4992'>
-        <var-decl name='date' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
+        <var-decl name='date' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='485' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5056'>
-        <var-decl name='time' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='486' column='1'/>
+        <var-decl name='time' type-id='type-id-146' 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-236' visibility='default' filepath='../.././libcpp/internal.h' line='489' column='1'/>
+        <var-decl name='avoid_paste' type-id='type-id-235' 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-236' visibility='default' filepath='../.././libcpp/internal.h' line='490' column='1'/>
+        <var-decl name='eof' type-id='type-id-235' 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-254' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
+        <var-decl name='deps' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='493' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='5568'>
         <var-decl name='hash_ob' type-id='type-id-31' visibility='default' filepath='../.././libcpp/internal.h' line='497' column='1'/>
@@ -3714,76 +3713,76 @@
         <var-decl name='buffer_ob' type-id='type-id-31' visibility='default' filepath='../.././libcpp/internal.h' line='501' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='6976'>
-        <var-decl name='pragmas' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
+        <var-decl name='pragmas' type-id='type-id-254' visibility='default' filepath='../.././libcpp/internal.h' line='505' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='7040'>
-        <var-decl name='cb' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
+        <var-decl name='cb' type-id='type-id-255' visibility='default' filepath='../.././libcpp/internal.h' line='508' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8192'>
-        <var-decl name='hash_table' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
+        <var-decl name='hash_table' type-id='type-id-256' visibility='default' filepath='../.././libcpp/internal.h' line='511' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8256'>
-        <var-decl name='op_stack' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_stack' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='op_limit' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
+        <var-decl name='op_limit' type-id='type-id-257' visibility='default' filepath='../.././libcpp/internal.h' line='514' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='8384'>
-        <var-decl name='opts' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
+        <var-decl name='opts' type-id='type-id-258' visibility='default' filepath='../.././libcpp/internal.h' line='517' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9408'>
-        <var-decl name='spec_nodes' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
+        <var-decl name='spec_nodes' type-id='type-id-259' visibility='default' filepath='../.././libcpp/internal.h' line='521' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9664'>
         <var-decl name='our_hashtable' type-id='type-id-41' visibility='default' filepath='../.././libcpp/internal.h' line='524' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9728'>
-        <var-decl name='out' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
+        <var-decl name='out' type-id='type-id-237' visibility='default' filepath='../.././libcpp/internal.h' line='533' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='9984'>
-        <var-decl name='saved_cur' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_cur' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10048'>
-        <var-decl name='saved_rlimit' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_rlimit' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10112'>
-        <var-decl name='saved_line_base' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
+        <var-decl name='saved_line_base' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10176'>
-        <var-decl name='savedstate' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
+        <var-decl name='savedstate' type-id='type-id-260' visibility='default' filepath='../.././libcpp/internal.h' line='540' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10240'>
         <var-decl name='counter' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='543' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10304'>
-        <var-decl name='comments' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
+        <var-decl name='comments' type-id='type-id-261' visibility='default' filepath='../.././libcpp/internal.h' line='546' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10432'>
-        <var-decl name='pushed_macros' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
+        <var-decl name='pushed_macros' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='549' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='10496'>
         <var-decl name='forced_token_location_p' type-id='type-id-134' visibility='default' filepath='../.././libcpp/internal.h' line='553' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-239'/>
-    <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-264'>
+    <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-238'/>
+    <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-263'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='cur' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
+        <var-decl name='cur' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='299' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='line_base' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='300' column='1'/>
+        <var-decl name='line_base' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='300' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='next_line' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='301' column='1'/>
+        <var-decl name='next_line' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='301' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='buf' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='303' column='1'/>
+        <var-decl name='buf' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='303' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='rlimit' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='304' column='1'/>
+        <var-decl name='rlimit' type-id='type-id-146' 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-265' visibility='default' filepath='../.././libcpp/internal.h' line='306' column='1'/>
+        <var-decl name='notes' type-id='type-id-264' 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-35' visibility='default' filepath='../.././libcpp/internal.h' line='307' column='1'/>
@@ -3795,16 +3794,16 @@
         <var-decl name='notes_cap' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='309' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='prev' type-id='type-id-240' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
+        <var-decl name='prev' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='311' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='file' type-id='type-id-248' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
+        <var-decl name='file' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='315' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='timestamp' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='319' column='1'/>
+        <var-decl name='timestamp' type-id='type-id-146' 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-266' visibility='default' filepath='../.././libcpp/internal.h' line='323' column='1'/>
+        <var-decl name='if_stack' type-id='type-id-265' 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-41' visibility='default' filepath='../.././libcpp/internal.h' line='326' column='1'/>
@@ -3822,24 +3821,24 @@
         <var-decl name='sysp' type-id='type-id-132' visibility='default' filepath='../.././libcpp/internal.h' line='346' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='dir' type-id='type-id-247' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
+        <var-decl name='dir' type-id='type-id-246' visibility='default' filepath='../.././libcpp/internal.h' line='350' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='input_cset_desc' type-id='type-id-253' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
+        <var-decl name='input_cset_desc' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='354' column='1'/>
       </data-member>
     </class-decl>
-    <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-267'>
+    <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-266'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pos' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
+        <var-decl name='pos' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='287' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='type' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='293' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='_cpp_line_note' type-id='type-id-267' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-268'/>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-265'/>
-    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-240'/>
-    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-269'>
+    <typedef-decl name='_cpp_line_note' type-id='type-id-266' filepath='../.././libcpp/internal.h' line='283' column='1' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-264'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-239'/>
+    <class-decl name='_cpp_file' size-in-bits='1856' is-struct='yes' visibility='default' filepath='../.././libcpp/files.c' line='56' column='1' id='type-id-268'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-8' visibility='default' filepath='../.././libcpp/files.c' line='59' column='1'/>
       </data-member>
@@ -3853,19 +3852,19 @@
         <var-decl name='dir_name' type-id='type-id-8' visibility='default' filepath='../.././libcpp/files.c' line='69' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='next_file' type-id='type-id-248' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
+        <var-decl name='next_file' type-id='type-id-247' visibility='default' filepath='../.././libcpp/files.c' line='72' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='buffer' type-id='type-id-270' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
+        <var-decl name='buffer' type-id='type-id-269' visibility='default' filepath='../.././libcpp/files.c' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='buffer_start' type-id='type-id-270' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
+        <var-decl name='buffer_start' type-id='type-id-269' visibility='default' filepath='../.././libcpp/files.c' line='79' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='cmacro' type-id='type-id-250' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
+        <var-decl name='cmacro' type-id='type-id-249' visibility='default' filepath='../.././libcpp/files.c' line='82' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='dir' type-id='type-id-246' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
+        <var-decl name='dir' type-id='type-id-245' visibility='default' filepath='../.././libcpp/files.c' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
         <var-decl name='st' type-id='type-id-43' visibility='default' filepath='../.././libcpp/files.c' line='90' column='1'/>
@@ -3892,12 +3891,12 @@
         <var-decl name='buffer_valid' type-id='type-id-41' visibility='default' filepath='../.././libcpp/files.c' line='112' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-248'/>
-    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-271'/>
-    <pointer-type-def type-id='type-id-271' size-in-bits='64' id='type-id-266'/>
-    <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-247'>
+    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-247'/>
+    <class-decl name='if_stack' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-270'/>
+    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-265'/>
+    <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-246'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-246' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
+        <var-decl name='next' type-id='type-id-245' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='556' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-9' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='559' column='1'/>
@@ -3915,40 +3914,40 @@
         <var-decl name='canonical_name' type-id='type-id-9' 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-272' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='575' column='1'/>
+        <var-decl name='name_map' type-id='type-id-271' 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-273' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='581' column='1'/>
+        <var-decl name='construct' type-id='type-id-272' 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-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='585' column='1'/>
+        <var-decl name='ino' type-id='type-id-273' 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-275' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
+        <var-decl name='dev' type-id='type-id-274' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='586' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-272'/>
-    <pointer-type-def type-id='type-id-276' size-in-bits='64' id='type-id-273'/>
-    <typedef-decl name='ino_t' type-id='type-id-45' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-274'/>
-    <typedef-decl name='dev_t' type-id='type-id-44' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-275'/>
-    <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-253'>
+    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-271'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-272'/>
+    <typedef-decl name='ino_t' type-id='type-id-45' filepath='/usr/include/sys/types.h' line='49' column='1' id='type-id-273'/>
+    <typedef-decl name='dev_t' type-id='type-id-44' filepath='/usr/include/sys/types.h' line='61' column='1' id='type-id-274'/>
+    <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-252'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='func' type-id='type-id-277' visibility='default' filepath='../.././libcpp/internal.h' line='49' column='1'/>
+        <var-decl name='func' type-id='type-id-276' 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-216' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
+        <var-decl name='cd' type-id='type-id-218' visibility='default' filepath='../.././libcpp/internal.h' line='50' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='width' type-id='type-id-3' visibility='default' filepath='../.././libcpp/internal.h' line='51' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-278'/>
-    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
-    <pointer-type-def type-id='type-id-280' size-in-bits='64' id='type-id-281'/>
-    <typedef-decl name='convert_f' type-id='type-id-281' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-277'/>
-    <typedef-decl name='cpp_buffer' type-id='type-id-264' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-282'/>
-    <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-241'>
+    <class-decl name='_cpp_strbuf' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-280'/>
+    <typedef-decl name='convert_f' type-id='type-id-280' filepath='../.././libcpp/internal.h' line='45' column='1' id='type-id-276'/>
+    <typedef-decl name='cpp_buffer' type-id='type-id-263' filepath='../.././libcpp/include/cpplib.h' line='32' column='1' id='type-id-281'/>
+    <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-240'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='in_directive' type-id='type-id-132' visibility='default' filepath='../.././libcpp/internal.h' line='228' column='1'/>
       </data-member>
@@ -3992,57 +3991,57 @@
         <var-decl name='pragma_allow_expansion' type-id='type-id-132' visibility='default' filepath='../.././libcpp/internal.h' line='271' column='1'/>
       </data-member>
     </class-decl>
-    <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-283'>
+    <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-282'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-242' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
+        <var-decl name='next' type-id='type-id-241' visibility='default' filepath='../.././libcpp/internal.h' line='103' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='base' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='base' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='cur' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='cur' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='limit' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
+        <var-decl name='limit' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='104' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-283' size-in-bits='64' id='type-id-242'/>
-    <typedef-decl name='_cpp_buff' type-id='type-id-283' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-284'/>
-    <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-243'>
+    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-241'/>
+    <typedef-decl name='_cpp_buff' type-id='type-id-282' filepath='../.././libcpp/internal.h' line='100' column='1' id='type-id-283'/>
+    <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-242'>
       <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-285'>
+        <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-284'>
           <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-286'>
+            <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-285'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='first' type-id='type-id-287' visibility='default' filepath='../.././libcpp/internal.h' line='189' column='1'/>
+                <var-decl name='first' type-id='type-id-286' 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-287' visibility='default' filepath='../.././libcpp/internal.h' line='190' column='1'/>
+                <var-decl name='last' type-id='type-id-286' 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__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-288'>
+            <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='195' column='1' id='type-id-287'>
               <data-member access='public' layout-offset-in-bits='0'>
-                <var-decl name='cur' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
+                <var-decl name='cur' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='196' column='1'/>
               </data-member>
               <data-member access='public' layout-offset-in-bits='64'>
-                <var-decl name='rlimit' type-id='type-id-144' visibility='default' filepath='../.././libcpp/internal.h' line='197' column='1'/>
+                <var-decl name='rlimit' type-id='type-id-146' visibility='default' filepath='../.././libcpp/internal.h' line='197' column='1'/>
               </data-member>
             </class-decl>
           </member-type>
           <data-member access='private'>
-            <var-decl name='iso' type-id='type-id-286' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
+            <var-decl name='iso' type-id='type-id-285' visibility='default' filepath='../.././libcpp/internal.h' line='191' column='1'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='trad' type-id='type-id-288' visibility='default' filepath='../.././libcpp/internal.h' line='198' column='1'/>
+            <var-decl name='trad' type-id='type-id-287' 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__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-289'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='../.././libcpp/internal.h' line='216' column='1' id='type-id-288'>
           <data-member access='private'>
-            <var-decl name='mc' type-id='type-id-290' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
+            <var-decl name='mc' type-id='type-id-289' visibility='default' filepath='../.././libcpp/internal.h' line='217' column='1'/>
           </data-member>
           <data-member access='private'>
             <var-decl name='macro' type-id='type-id-133' visibility='default' filepath='../.././libcpp/internal.h' line='218' column='1'/>
@@ -4050,36 +4049,36 @@
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='next' type-id='type-id-243' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-244' visibility='default' filepath='../.././libcpp/internal.h' line='180' column='1'/>
+        <var-decl name='prev' type-id='type-id-243' 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-285' visibility='default' filepath='../.././libcpp/internal.h' line='199' column='1'/>
+        <var-decl name='u' type-id='type-id-284' 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-242' visibility='default' filepath='../.././libcpp/internal.h' line='203' column='1'/>
+        <var-decl name='buff' type-id='type-id-241' 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-289' visibility='default' filepath='../.././libcpp/internal.h' line='219' column='1'/>
+        <var-decl name='c' type-id='type-id-288' 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-291' visibility='default' filepath='../.././libcpp/internal.h' line='222' column='1'/>
+        <var-decl name='tokens_kind' type-id='type-id-290' 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-287'>
+    <union-decl name='utoken' size-in-bits='64' visibility='default' filepath='../.././libcpp/internal.h' line='122' column='1' id='type-id-286'>
       <data-member access='private'>
-        <var-decl name='token' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
+        <var-decl name='token' type-id='type-id-291' visibility='default' filepath='../.././libcpp/internal.h' line='124' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='ptoken' type-id='type-id-293' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
+        <var-decl name='ptoken' type-id='type-id-292' visibility='default' filepath='../.././libcpp/internal.h' line='125' column='1'/>
       </data-member>
     </union-decl>
-    <qualified-type-def type-id='type-id-236' const='yes' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-292'/>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-295' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-296'>
+    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-291'/>
+    <pointer-type-def type-id='type-id-291' size-in-bits='64' id='type-id-292'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-294' visibility='default' filepath='../.././libcpp/internal.h' line='146' column='1' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='macro_node' type-id='type-id-133' visibility='default' filepath='../.././libcpp/internal.h' line='148' column='1'/>
       </data-member>
@@ -4090,41 +4089,41 @@
         <var-decl name='cur_virt_loc' type-id='type-id-134' visibility='default' filepath='../.././libcpp/internal.h' line='157' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='macro_context' type-id='type-id-296' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-295'/>
-    <pointer-type-def type-id='type-id-295' size-in-bits='64' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
-    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-291'>
+    <typedef-decl name='macro_context' type-id='type-id-295' filepath='../.././libcpp/internal.h' line='158' column='1' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
+    <enum-decl name='context_tokens_kind' filepath='../.././libcpp/internal.h' line='161' column='1' id='type-id-290'>
       <underlying-type type-id='type-id-92'/>
       <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='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-297'/>
-    <qualified-type-def type-id='type-id-297' const='yes' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-245'/>
-    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-299'/>
+    <class-decl name='directive' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-296'/>
+    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-297'/>
+    <pointer-type-def type-id='type-id-297' size-in-bits='64' id='type-id-244'/>
+    <class-decl name='file_hash_entry_pool' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-248'/>
+    <qualified-type-def type-id='type-id-234' const='yes' id='type-id-299'/>
     <pointer-type-def type-id='type-id-299' size-in-bits='64' id='type-id-249'/>
-    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-300'/>
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-250'/>
-    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-301'>
+    <class-decl name='tokenrun' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='130' column='1' id='type-id-300'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='next' type-id='type-id-251' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-252' visibility='default' filepath='../.././libcpp/internal.h' line='132' column='1'/>
+        <var-decl name='prev' type-id='type-id-251' 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-155' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='base' type-id='type-id-157' 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-155' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
+        <var-decl name='limit' type-id='type-id-157' visibility='default' filepath='../.././libcpp/internal.h' line='133' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-252'/>
-    <typedef-decl name='tokenrun' type-id='type-id-301' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-251'/>
-    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-302'>
+    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-251'/>
+    <typedef-decl name='tokenrun' type-id='type-id-300' filepath='../.././libcpp/internal.h' line='129' column='1' id='type-id-250'/>
+    <class-decl name='deps' size-in-bits='448' is-struct='yes' visibility='default' filepath='../.././libcpp/mkdeps.c' line='30' column='1' id='type-id-301'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='targetv' type-id='type-id-272' visibility='default' filepath='../.././libcpp/mkdeps.c' line='32' column='1'/>
+        <var-decl name='targetv' type-id='type-id-271' 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-35' visibility='default' filepath='../.././libcpp/mkdeps.c' line='33' column='1'/>
@@ -4133,7 +4132,7 @@
         <var-decl name='targets_size' type-id='type-id-35' 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-272' visibility='default' filepath='../.././libcpp/mkdeps.c' line='36' column='1'/>
+        <var-decl name='depv' type-id='type-id-271' 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-35' visibility='default' filepath='../.././libcpp/mkdeps.c' line='37' column='1'/>
@@ -4142,10 +4141,10 @@
         <var-decl name='deps_size' type-id='type-id-35' 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-272' visibility='default' filepath='../.././libcpp/mkdeps.c' line='40' column='1'/>
+        <var-decl name='vpathv' type-id='type-id-271' 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-217' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
+        <var-decl name='vpathlv' type-id='type-id-219' visibility='default' filepath='../.././libcpp/mkdeps.c' line='41' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
         <var-decl name='nvpaths' type-id='type-id-35' visibility='default' filepath='../.././libcpp/mkdeps.c' line='42' column='1'/>
@@ -4154,99 +4153,99 @@
         <var-decl name='vpaths_size' type-id='type-id-35' visibility='default' filepath='../.././libcpp/mkdeps.c' line='43' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-301' size-in-bits='64' id='type-id-253'/>
+    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-302'/>
     <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-254'/>
-    <class-decl name='pragma_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-303'/>
-    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-255'/>
-    <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-256'>
+    <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-255'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='line_change' type-id='type-id-304' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='502' column='1'/>
+        <var-decl name='line_change' type-id='type-id-303' 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-305' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='508' column='1'/>
+        <var-decl name='file_change' type-id='type-id-304' 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-306' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='510' column='1'/>
+        <var-decl name='dir_change' type-id='type-id-305' 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-307' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='512' column='1'/>
+        <var-decl name='include' type-id='type-id-306' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='513' column='1'/>
+        <var-decl name='define' type-id='type-id-307' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='514' column='1'/>
+        <var-decl name='undef' type-id='type-id-307' 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-309' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='515' column='1'/>
+        <var-decl name='ident' type-id='type-id-308' 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-310' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='516' column='1'/>
+        <var-decl name='def_pragma' type-id='type-id-309' 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-311' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='517' column='1'/>
+        <var-decl name='valid_pch' type-id='type-id-310' 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-312' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='518' column='1'/>
+        <var-decl name='read_pch' type-id='type-id-311' 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-313' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='519' column='1'/>
+        <var-decl name='missing_header' type-id='type-id-312' 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-314' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='523' column='1'/>
+        <var-decl name='macro_to_expand' type-id='type-id-313' 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-315' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='529' column='1'/>
+        <var-decl name='error' type-id='type-id-314' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='533' column='1'/>
+        <var-decl name='used_define' type-id='type-id-307' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='534' column='1'/>
+        <var-decl name='used_undef' type-id='type-id-307' 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-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='537' column='1'/>
+        <var-decl name='before_define' type-id='type-id-315' 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-308' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='540' column='1'/>
+        <var-decl name='used' type-id='type-id-307' 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-317' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
+        <var-decl name='user_builtin_macro' type-id='type-id-316' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='543' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_reader' type-id='type-id-237' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-318' size-in-bits='64' id='type-id-319'/>
+    <typedef-decl name='cpp_reader' type-id='type-id-236' filepath='../.././libcpp/include/cpplib.h' line='31' column='1' id='type-id-317'/>
+    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-303'/>
     <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-304'/>
     <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-305'/>
     <pointer-type-def type-id='type-id-322' size-in-bits='64' id='type-id-306'/>
     <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-308'/>
-    <typedef-decl name='cpp_string' type-id='type-id-159' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-325'/>
-    <qualified-type-def type-id='type-id-325' const='yes' id='type-id-326'/>
-    <pointer-type-def type-id='type-id-326' size-in-bits='64' id='type-id-327'/>
+    <typedef-decl name='cpp_string' type-id='type-id-161' filepath='../.././libcpp/include/cpplib.h' line='35' column='1' id='type-id-324'/>
+    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-325'/>
+    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-326'/>
+    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-308'/>
     <pointer-type-def type-id='type-id-328' size-in-bits='64' id='type-id-309'/>
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-310'/>
     <pointer-type-def type-id='type-id-330' size-in-bits='64' id='type-id-311'/>
-    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-312'/>
-    <typedef-decl name='cpp_dir' type-id='type-id-247' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-332'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-333'/>
-    <pointer-type-def type-id='type-id-334' size-in-bits='64' id='type-id-335'/>
-    <typedef-decl name='missing_header_cb' type-id='type-id-335' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-313'/>
+    <typedef-decl name='cpp_dir' type-id='type-id-246' filepath='../.././libcpp/include/cpplib.h' line='39' column='1' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-334'/>
+    <typedef-decl name='missing_header_cb' type-id='type-id-334' filepath='../.././libcpp/include/cpplib.h' line='496' column='1' id='type-id-312'/>
+    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-313'/>
     <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-314'/>
     <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-315'/>
     <pointer-type-def type-id='type-id-338' size-in-bits='64' id='type-id-316'/>
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-317'/>
-    <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-340'>
+    <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-339'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='stack' type-id='type-id-31' 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-341' visibility='default' filepath='../.././libcpp/include/symtab.h' line='52' column='1'/>
+        <var-decl name='entries' type-id='type-id-340' 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-342' visibility='default' filepath='../.././libcpp/include/symtab.h' line='54' column='1'/>
+        <var-decl name='alloc_node' type-id='type-id-341' 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-215' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
+        <var-decl name='alloc_subobject' type-id='type-id-217' visibility='default' filepath='../.././libcpp/include/symtab.h' line='57' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='nslots' type-id='type-id-35' visibility='default' filepath='../.././libcpp/include/symtab.h' line='59' column='1'/>
@@ -4255,7 +4254,7 @@
         <var-decl name='nelements' type-id='type-id-35' visibility='default' filepath='../.././libcpp/include/symtab.h' line='60' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='pfile' type-id='type-id-319' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
+        <var-decl name='pfile' type-id='type-id-318' visibility='default' filepath='../.././libcpp/include/symtab.h' line='63' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
         <var-decl name='searches' type-id='type-id-35' visibility='default' filepath='../.././libcpp/include/symtab.h' line='66' column='1'/>
@@ -4267,33 +4266,33 @@
         <var-decl name='entries_owned' type-id='type-id-41' visibility='default' filepath='../.././libcpp/include/symtab.h' line='70' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-343'/>
-    <typedef-decl name='hashnode' type-id='type-id-343' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-344'/>
-    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-341'/>
-    <typedef-decl name='hash_table' type-id='type-id-340' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-345'/>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-342'/>
-    <pointer-type-def type-id='type-id-340' size-in-bits='64' id='type-id-257'/>
-    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-348'>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-342'/>
+    <typedef-decl name='hashnode' type-id='type-id-342' filepath='../.././libcpp/include/symtab.h' line='42' column='1' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-340'/>
+    <typedef-decl name='hash_table' type-id='type-id-339' filepath='../.././libcpp/include/symtab.h' line='41' column='1' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-344' size-in-bits='64' id='type-id-345'/>
+    <pointer-type-def type-id='type-id-346' size-in-bits='64' id='type-id-341'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-256'/>
+    <class-decl name='op' size-in-bits='320' is-struct='yes' visibility='default' filepath='../.././libcpp/expr.c' line='30' column='1' id='type-id-347'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='token' type-id='type-id-292' visibility='default' filepath='../.././libcpp/expr.c' line='32' column='1'/>
+        <var-decl name='token' type-id='type-id-291' 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-349' visibility='default' filepath='../.././libcpp/expr.c' line='33' column='1'/>
+        <var-decl name='value' type-id='type-id-348' 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-106' 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-161' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
+        <var-decl name='op' type-id='type-id-163' visibility='default' filepath='../.././libcpp/expr.c' line='35' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-348' size-in-bits='64' id='type-id-258'/>
-    <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-259'>
+    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-257'/>
+    <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-258'>
       <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-350'>
+        <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-349'>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='style' type-id='type-id-351' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='453' column='1'/>
+            <var-decl name='style' type-id='type-id-350' 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-41' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='456' column='1'/>
@@ -4313,7 +4312,7 @@
         <var-decl name='tabstop' type-id='type-id-35' 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-352' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='296' column='1'/>
+        <var-decl name='lang' type-id='type-id-351' 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-132' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='299' column='1'/>
@@ -4439,7 +4438,7 @@
         <var-decl name='input_charset' type-id='type-id-8' 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-353' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='441' column='1'/>
+        <var-decl name='warn_normalize' type-id='type-id-352' 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-41' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='444' column='1'/>
@@ -4448,7 +4447,7 @@
         <var-decl name='restore_pch_deps' type-id='type-id-41' 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-350' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='468' column='1'/>
+        <var-decl name='deps' type-id='type-id-349' 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-5' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='474' column='1'/>
@@ -4478,13 +4477,13 @@
         <var-decl name='directives_only' type-id='type-id-41' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='487' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-351'>
+    <enum-decl name='cpp_deps_style' filepath='../.././libcpp/include/cpplib.h' line='273' column='1' id='type-id-350'>
       <underlying-type type-id='type-id-92'/>
       <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-352'>
+    <enum-decl name='c_lang' filepath='../.././libcpp/include/cpplib.h' line='168' column='1' id='type-id-351'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='CLK_GNUC89' value='0'/>
       <enumerator name='CLK_GNUC99' value='1'/>
@@ -4499,14 +4498,14 @@
       <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-353'>
+    <enum-decl name='cpp_normalize_level' filepath='../.././libcpp/include/cpplib.h' line='276' column='1' id='type-id-352'>
       <underlying-type type-id='type-id-92'/>
       <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='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-260'>
+    <class-decl name='spec_nodes' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libcpp/internal.h' line='275' column='1' id='type-id-259'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='n_defined' type-id='type-id-133' visibility='default' filepath='../.././libcpp/internal.h' line='277' column='1'/>
       </data-member>
@@ -4520,11 +4519,11 @@
         <var-decl name='n__VA_ARGS__' type-id='type-id-133' visibility='default' filepath='../.././libcpp/internal.h' line='280' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-354'/>
-    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-261'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-262' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-355'>
+    <class-decl name='cpp_savedstate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-353'/>
+    <pointer-type-def type-id='type-id-353' size-in-bits='64' id='type-id-260'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-261' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-354'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-355' 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-3' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -4533,7 +4532,7 @@
         <var-decl name='allocated' type-id='type-id-3' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-357' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-358'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-357'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='comment' type-id='type-id-9' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
       </data-member>
@@ -4541,18 +4540,18 @@
         <var-decl name='sloc' type-id='type-id-106' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_comment' type-id='type-id-358' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-357'/>
-    <pointer-type-def type-id='type-id-357' size-in-bits='64' id='type-id-356'/>
-    <typedef-decl name='cpp_comment_table' type-id='type-id-355' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-262'/>
-    <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-359'>
+    <typedef-decl name='cpp_comment' type-id='type-id-357' filepath='../.././libcpp/include/cpplib.h' line='967' column='1' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-355'/>
+    <typedef-decl name='cpp_comment_table' type-id='type-id-354' filepath='../.././libcpp/include/cpplib.h' line='981' column='1' id='type-id-261'/>
+    <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-358'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-263' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
+        <var-decl name='next' type-id='type-id-262' visibility='default' filepath='../.././libcpp/internal.h' line='360' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='name' type-id='type-id-9' visibility='default' filepath='../.././libcpp/internal.h' line='362' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='definition' type-id='type-id-239' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
+        <var-decl name='definition' type-id='type-id-238' visibility='default' filepath='../.././libcpp/internal.h' line='364' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='line' type-id='type-id-106' visibility='default' filepath='../.././libcpp/internal.h' line='367' column='1'/>
@@ -4567,78 +4566,78 @@
         <var-decl name='is_undef' type-id='type-id-35' visibility='default' filepath='../.././libcpp/internal.h' line='374' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-262'/>
     <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-319' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='178' column='1'/>
       <parameter type-id='type-id-2' name='v' filepath='../.././libcpp/macro.c' line='179' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <typedef-decl name='uchar' type-id='type-id-132' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-360'/>
-    <qualified-type-def type-id='type-id-360' const='yes' id='type-id-361'/>
-    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-270'/>
+    <typedef-decl name='uchar' type-id='type-id-132' filepath='../.././libcpp/include/cpp-id-data.h' line='22' column='1' id='type-id-359'/>
+    <qualified-type-def type-id='type-id-359' const='yes' id='type-id-360'/>
+    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-269'/>
     <function-decl name='_cpp_builtin_macro_text' mangled-name='_cpp_builtin_macro_text' filepath='../.././libcpp/macro.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_builtin_macro_text'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='218' column='1'/>
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='218' column='1'/>
-      <return type-id='type-id-270'/>
+      <return type-id='type-id-269'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-362'/>
+    <pointer-type-def type-id='type-id-359' size-in-bits='64' id='type-id-361'/>
     <function-decl name='cpp_quote_string' mangled-name='_Z16cpp_quote_stringPhPKhj' filepath='../.././libcpp/macro.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_quote_stringPhPKhj'>
-      <parameter type-id='type-id-362' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
-      <parameter type-id='type-id-270' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-361' name='dest' filepath='../.././libcpp/macro.c' line='434' column='1'/>
+      <parameter type-id='type-id-269' name='src' filepath='../.././libcpp/macro.c' line='434' column='1'/>
       <parameter type-id='type-id-35' name='len' filepath='../.././libcpp/macro.c' line='434' column='1'/>
-      <return type-id='type-id-362'/>
+      <return type-id='type-id-361'/>
     </function-decl>
     <function-decl name='_cpp_arguments_ok' mangled-name='_cpp_arguments_ok' filepath='../.././libcpp/macro.c' line='663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_arguments_ok'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
-      <parameter type-id='type-id-145' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
-      <parameter type-id='type-id-250' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-147' name='macro' filepath='../.././libcpp/macro.c' line='663' column='1'/>
+      <parameter type-id='type-id-249' name='node' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <parameter type-id='type-id-35' name='argc' filepath='../.././libcpp/macro.c' line='663' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_push_token_context' mangled-name='_cpp_push_token_context' filepath='../.././libcpp/macro.c' line='1787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_token_context'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
       <parameter type-id='type-id-133' name='macro' filepath='../.././libcpp/macro.c' line='1787' column='1'/>
-      <parameter type-id='type-id-292' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
+      <parameter type-id='type-id-291' name='first' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/macro.c' line='1788' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_push_text_context' mangled-name='_cpp_push_text_context' filepath='../.././libcpp/macro.c' line='1830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_push_text_context'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
       <parameter type-id='type-id-133' name='macro' filepath='../.././libcpp/macro.c' line='1830' column='1'/>
-      <parameter type-id='type-id-270' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
+      <parameter type-id='type-id-269' name='start' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/macro.c' line='1831' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_pop_context' mangled-name='_cpp_pop_context' filepath='../.././libcpp/macro.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_context'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_sys_macro_p' mangled-name='_Z15cpp_sys_macro_pP10cpp_reader' filepath='../.././libcpp/macro.c' line='2437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_sys_macro_pP10cpp_reader'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='_cpp_backup_tokens_direct' mangled-name='_cpp_backup_tokens_direct' filepath='../.././libcpp/macro.c' line='2469' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_backup_tokens_direct'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_backup_tokens' mangled-name='_Z18_cpp_backup_tokensP10cpp_readerj' filepath='../.././libcpp/macro.c' line='2488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18_cpp_backup_tokensP10cpp_readerj'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/macro.c' line='2469' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_get_token_with_location' mangled-name='_Z27cpp_get_token_with_locationP10cpp_readerPj' filepath='../.././libcpp/macro.c' line='2424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z27cpp_get_token_with_locationP10cpp_readerPj'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
       <parameter type-id='type-id-134' name='loc' filepath='../.././libcpp/macro.c' line='2424' column='1'/>
-      <return type-id='type-id-292'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <function-decl name='cpp_get_token' mangled-name='_Z13cpp_get_tokenP10cpp_reader' filepath='../.././libcpp/macro.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_get_tokenP10cpp_reader'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
-      <return type-id='type-id-292'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <function-decl name='cpp_scan_nooutput' mangled-name='_Z17cpp_scan_nooutputP10cpp_reader' filepath='../.././libcpp/macro.c' line='2447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_scan_nooutputP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_free_definition' mangled-name='_cpp_free_definition' filepath='../.././libcpp/macro.c' line='2579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_definition'>
@@ -4646,47 +4645,47 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_save_parameter' mangled-name='_cpp_save_parameter' filepath='../.././libcpp/macro.c' line='2590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_parameter'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
-      <parameter type-id='type-id-145' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
+      <parameter type-id='type-id-147' name='macro' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='2590' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_create_definition' mangled-name='_cpp_create_definition' filepath='../.././libcpp/macro.c' line='2938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_definition'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-133'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_macro_definition' mangled-name='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode' filepath='../.././libcpp/macro.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_macro_definitionP10cpp_readerP12cpp_hashnode'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-146'/>
     </function-decl>
     <var-decl name='num_expanded_macros_counter' type-id='type-id-35' mangled-name='num_expanded_macros_counter' visibility='default' filepath='../.././libcpp/macro.c' line='170' column='1' elf-symbol-id='num_expanded_macros_counter'/>
     <var-decl name='num_macro_tokens_counter' type-id='type-id-35' 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-319'/>
-      <return type-id='type-id-155'/>
+      <parameter type-id='type-id-318'/>
+      <return type-id='type-id-157'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-362'/>
     <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-319'/>
-      <parameter type-id='type-id-363'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-362'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_error' mangled-name='_Z9cpp_errorP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errorP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-41'/>
     </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-319'/>
-      <return type-id='type-id-155'/>
+      <parameter type-id='type-id-318'/>
+      <return type-id='type-id-157'/>
     </function-decl>
     <function-decl name='cpp_warning_with_line' mangled-name='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='932' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z21cpp_warning_with_lineP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-35'/>
@@ -4694,19 +4693,19 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-41'/>
     </function-decl>
-    <typedef-decl name='time_t' type-id='type-id-54' filepath='/usr/include/time.h' line='76' column='1' id='type-id-364'/>
-    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-365'/>
+    <typedef-decl name='time_t' type-id='type-id-54' filepath='/usr/include/time.h' line='76' column='1' id='type-id-363'/>
+    <pointer-type-def type-id='type-id-363' size-in-bits='64' id='type-id-364'/>
     <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-365'/>
-      <return type-id='type-id-364'/>
+      <parameter type-id='type-id-364'/>
+      <return type-id='type-id-363'/>
     </function-decl>
     <function-decl name='cpp_errno' mangled-name='_Z9cpp_errnoP10cpp_readeriPKc' filepath='../.././libcpp/include/cpplib.h' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_errnoP10cpp_readeriPKc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-41'/>
     </function-decl>
-    <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-366'>
+    <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-365'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-3' visibility='default' filepath='/usr/include/time.h' line='135' column='1'/>
       </data-member>
@@ -4741,130 +4740,130 @@
         <var-decl name='tm_zone' type-id='type-id-8' visibility='default' filepath='/usr/include/time.h' line='147' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-367'/>
-    <qualified-type-def type-id='type-id-364' const='yes' id='type-id-368'/>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
+    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
+    <qualified-type-def type-id='type-id-363' const='yes' id='type-id-367'/>
+    <pointer-type-def type-id='type-id-367' size-in-bits='64' id='type-id-368'/>
     <function-decl name='localtime' filepath='/usr/include/time.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-369'/>
-      <return type-id='type-id-367'/>
+      <parameter type-id='type-id-368'/>
+      <return type-id='type-id-366'/>
     </function-decl>
     <function-decl name='_cpp_unaligned_alloc' mangled-name='_cpp_unaligned_alloc' filepath='../.././libcpp/internal.h' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_unaligned_alloc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
-    <typedef-decl name='_cpp_file' type-id='type-id-269' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-370'/>
+    <typedef-decl name='_cpp_file' type-id='type-id-268' filepath='../.././libcpp/internal.h' line='622' column='1' id='type-id-369'/>
     <function-decl name='_cpp_get_file_name' mangled-name='_cpp_get_file_name' filepath='../.././libcpp/internal.h' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_name'>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-366' const='yes' id='type-id-371'/>
-    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-372'/>
+    <qualified-type-def type-id='type-id-365' const='yes' id='type-id-370'/>
+    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-371'/>
     <function-decl name='asctime' filepath='/usr/include/time.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-372'/>
+      <parameter type-id='type-id-371'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='_cpp_get_file_stat' mangled-name='_cpp_get_file_stat' filepath='../.././libcpp/internal.h' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_file_stat'>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <return type-id='type-id-56'/>
     </function-decl>
     <function-decl name='cpp_get_file' mangled-name='_Z12cpp_get_fileP10cpp_buffer' filepath='../.././libcpp/include/cpplib.h' line='1012' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_fileP10cpp_buffer'>
-      <parameter type-id='type-id-240'/>
-      <return type-id='type-id-248'/>
+      <parameter type-id='type-id-239'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <function-decl name='cpp_get_buffer' mangled-name='_Z14cpp_get_bufferP10cpp_reader' filepath='../.././libcpp/include/cpplib.h' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_get_bufferP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
-      <return type-id='type-id-240'/>
+      <parameter type-id='type-id-318'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/include/cpplib.h' line='793' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-3'/>
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <function-decl name='_cpp_clean_line' mangled-name='_cpp_clean_line' filepath='../.././libcpp/internal.h' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_clean_line'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_pop_buffer' mangled-name='_cpp_pop_buffer' filepath='../.././libcpp/internal.h' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_buffer'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_do__Pragma' mangled-name='_cpp_do__Pragma' filepath='../.././libcpp/internal.h' line='669' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do__Pragma'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2437' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='_cpp_free_buff' mangled-name='_cpp_free_buff' filepath='../.././libcpp/internal.h' line='111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_free_buff'>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-241'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_token_as_text' mangled-name='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_token_as_textP10cpp_readerPK9cpp_token'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-292'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-291'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <function-decl name='cpp_token_len' mangled-name='_Z13cpp_token_lenPK9cpp_token' filepath='../.././libcpp/include/cpplib.h' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_token_lenPK9cpp_token'>
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='cpp_spell_token' mangled-name='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb' filepath='../.././libcpp/include/cpplib.h' line='751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_spell_tokenP10cpp_readerPK9cpp_tokenPhb'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-292'/>
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-291'/>
+      <parameter type-id='type-id-238'/>
       <parameter type-id='type-id-41'/>
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <function-decl name='_cpp_get_buff' mangled-name='_cpp_get_buff' filepath='../.././libcpp/internal.h' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_buff'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='_cpp_append_extend_buff' mangled-name='_cpp_append_extend_buff' filepath='../.././libcpp/internal.h' line='110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_append_extend_buff'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-241'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-242'/>
+      <return type-id='type-id-241'/>
     </function-decl>
     <function-decl name='_cpp_release_buff' mangled-name='_cpp_release_buff' filepath='../.././libcpp/internal.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_release_buff'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-241'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_warning' mangled-name='_Z11cpp_warningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_warningP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_peek_token' mangled-name='_Z14cpp_peek_tokenP10cpp_readeri' filepath='../.././libcpp/include/cpplib.h' line='765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_peek_tokenP10cpp_readeri'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
-      <return type-id='type-id-292'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <function-decl name='_cpp_lex_token' mangled-name='_cpp_lex_token' filepath='../.././libcpp/internal.h' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_token'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
-      <return type-id='type-id-292'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='2380' column='1'/>
+      <return type-id='type-id-291'/>
     </function-decl>
     <function-decl name='_cpp_read_logical_line_trad' mangled-name='_cpp_read_logical_line_trad' filepath='../.././libcpp/internal.h' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_logical_line_trad'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_equiv_tokens' mangled-name='_cpp_equiv_tokens' filepath='../.././libcpp/internal.h' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_equiv_tokens'>
-      <parameter type-id='type-id-292'/>
-      <parameter type-id='type-id-292'/>
+      <parameter type-id='type-id-291'/>
+      <parameter type-id='type-id-291'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-150' const='yes' id='type-id-373'/>
-    <pointer-type-def type-id='type-id-373' size-in-bits='64' id='type-id-374'/>
+    <qualified-type-def type-id='type-id-152' const='yes' id='type-id-372'/>
+    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-373'/>
     <function-decl name='_cpp_expansions_different_trad' mangled-name='_cpp_expansions_different_trad' filepath='../.././libcpp/internal.h' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_expansions_different_trad'>
-      <parameter type-id='type-id-374'/>
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-373'/>
+      <parameter type-id='type-id-373'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_pedwarning_with_line' mangled-name='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_pedwarning_with_lineP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-35'/>
@@ -4873,7 +4872,7 @@
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_error_with_line' mangled-name='_Z19cpp_error_with_lineP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_error_with_lineP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-35'/>
@@ -4882,38 +4881,38 @@
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_pedwarning' mangled-name='_Z14cpp_pedwarningP10cpp_readeriPKcz' filepath='../.././libcpp/include/cpplib.h' line='917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_pedwarningP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_create_trad_definition' mangled-name='_cpp_create_trad_definition' filepath='../.././libcpp/internal.h' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_create_trad_definition'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-145'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-147'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_aligned_alloc' mangled-name='_cpp_aligned_alloc' filepath='../.././libcpp/internal.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_aligned_alloc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-239'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <function-decl name='_cpp_replacement_text_len' mangled-name='_cpp_replacement_text_len' filepath='../.././libcpp/internal.h' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_replacement_text_len'>
-      <parameter type-id='type-id-374'/>
+      <parameter type-id='type-id-373'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='_cpp_copy_replacement_text' filepath='../.././libcpp/internal.h' line='696' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-374'/>
-      <parameter type-id='type-id-239'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-373'/>
+      <parameter type-id='type-id-238'/>
+      <return type-id='type-id-238'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-339'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-338'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-133'/>
       <return type-id='type-id-41'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-337'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-336'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-106'/>
@@ -4922,99 +4921,99 @@
       <parameter type-id='type-id-100'/>
       <return type-id='type-id-41'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-280'>
-      <parameter type-id='type-id-216'/>
-      <parameter type-id='type-id-144'/>
+    <function-type size-in-bits='64' id='type-id-279'>
+      <parameter type-id='type-id-218'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-278'/>
       <return type-id='type-id-41'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-276'>
+    <function-type size-in-bits='64' id='type-id-275'>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-246'/>
+      <parameter type-id='type-id-245'/>
       <return type-id='type-id-9'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-334'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-333'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-333'/>
+      <parameter type-id='type-id-332'/>
       <return type-id='type-id-8'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-336'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-292'/>
+    <function-type size-in-bits='64' id='type-id-335'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-291'/>
       <return type-id='type-id-133'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-330'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-329'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-347'>
-      <parameter type-id='type-id-346'/>
-      <return type-id='type-id-344'/>
+    <function-type size-in-bits='64' id='type-id-346'>
+      <parameter type-id='type-id-345'/>
+      <return type-id='type-id-343'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-338'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-337'>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-322'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-321'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-331'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-330'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-320'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-292'/>
+    <function-type size-in-bits='64' id='type-id-319'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-291'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-321'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-320'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-78'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-329'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-328'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-106'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-328'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-327'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-327'/>
+      <parameter type-id='type-id-326'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-323'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-322'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-106'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-293'/>
+      <parameter type-id='type-id-292'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-324'>
-      <parameter type-id='type-id-319'/>
+    <function-type size-in-bits='64' id='type-id-323'>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-133'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <typedef-decl name='cpp_num' type-id='type-id-375' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-349'/>
-    <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-375'>
+    <typedef-decl name='cpp_num' type-id='type-id-374' filepath='../.././libcpp/include/cpplib.h' line='800' column='1' id='type-id-348'/>
+    <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-374'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='high' type-id='type-id-376' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
+        <var-decl name='high' type-id='type-id-375' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='803' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='low' type-id='type-id-376' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
+        <var-decl name='low' type-id='type-id-375' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='804' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='unsignedp' type-id='type-id-41' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='805' column='1'/>
@@ -5023,96 +5022,96 @@
         <var-decl name='overflow' type-id='type-id-41' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='806' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='cpp_num_part' type-id='type-id-4' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-376'/>
+    <typedef-decl name='cpp_num_part' type-id='type-id-4' filepath='../.././libcpp/include/cpplib.h' line='799' column='1' id='type-id-375'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/traditional.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'>
     <function-decl name='_cpp_overlay_buffer' mangled-name='_cpp_overlay_buffer' filepath='../.././libcpp/traditional.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_overlay_buffer'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
-      <parameter type-id='type-id-270' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
+      <parameter type-id='type-id-269' name='start' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/traditional.c' line='267' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_remove_overlay' mangled-name='_cpp_remove_overlay' filepath='../.././libcpp/traditional.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remove_overlay'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_scan_out_logical_line' mangled-name='_cpp_scan_out_logical_line' filepath='../.././libcpp/traditional.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_scan_out_logical_line'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-145'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-147'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_copy_replacement_text' mangled-name='_cpp_copy_replacement_text' filepath='../.././libcpp/traditional.c' line='790' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_copy_replacement_text'>
-      <parameter type-id='type-id-374' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
-      <parameter type-id='type-id-362' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
-      <return type-id='type-id-362'/>
+      <parameter type-id='type-id-373' name='macro' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <parameter type-id='type-id-361' name='dest' filepath='../.././libcpp/traditional.c' line='790' column='1'/>
+      <return type-id='type-id-361'/>
     </function-decl>
-    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-377'>
+    <enum-decl name='ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='44' column='1' id='type-id-376'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='HT_NO_INSERT' value='0'/>
       <enumerator name='HT_ALLOC' value='1'/>
     </enum-decl>
     <function-decl name='ht_lookup' mangled-name='_Z9ht_lookupP2htPKhm16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='79' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_lookupP2htPKhm16ht_lookup_option'>
-      <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-345'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-377'/>
-      <return type-id='type-id-344'/>
+      <parameter type-id='type-id-376'/>
+      <return type-id='type-id-343'/>
     </function-decl>
     <function-decl name='_cpp_push_text_context' filepath='../.././libcpp/internal.h' line='605' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-133'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_builtin_macro_text' filepath='../.././libcpp/internal.h' line='610' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
       <parameter type-id='type-id-133' name='node' filepath='../.././libcpp/macro.c' line='3080' column='1'/>
-      <return type-id='type-id-144'/>
+      <return type-id='type-id-146'/>
     </function-decl>
     <function-decl name='_cpp_skip_block_comment' mangled-name='_cpp_skip_block_comment' filepath='../.././libcpp/internal.h' line='649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_skip_block_comment'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_handle_directive' mangled-name='_cpp_handle_directive' filepath='../.././libcpp/internal.h' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_handle_directive'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='_cpp_process_line_notes' mangled-name='_cpp_process_line_notes' filepath='../.././libcpp/internal.h' line='646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_process_line_notes'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_get_fresh_line' mangled-name='_cpp_get_fresh_line' filepath='../.././libcpp/internal.h' line='648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_get_fresh_line'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-41'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <function-decl name='cpp_undef_all' mangled-name='_Z13cpp_undef_allP10cpp_reader' filepath='../.././libcpp/directives.c' line='639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z13cpp_undef_allP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_do_file_change' mangled-name='_cpp_do_file_change' filepath='../.././libcpp/directives.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_do_file_change'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <parameter type-id='type-id-130' name='reason' filepath='../.././libcpp/directives.c' line='1034' column='1'/>
       <parameter type-id='type-id-8' name='to_file' filepath='../.././libcpp/directives.c' line='1035' column='1'/>
       <parameter type-id='type-id-131' name='file_line' filepath='../.././libcpp/directives.c' line='1035' column='1'/>
       <parameter type-id='type-id-35' name='sysp' filepath='../.././libcpp/directives.c' line='1036' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <typedef-decl name='pragma_cb' type-id='type-id-316' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-378'/>
+    <typedef-decl name='pragma_cb' type-id='type-id-315' filepath='../.././libcpp/directives.c' line='43' column='1' id='type-id-377'/>
     <function-decl name='cpp_register_pragma' mangled-name='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb' filepath='../.././libcpp/directives.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_register_pragmaP10cpp_readerPKcS2_PFvS0_Eb'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <parameter type-id='type-id-8' name='space' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
       <parameter type-id='type-id-8' name='name' filepath='../.././libcpp/directives.c' line='1214' column='1'/>
-      <parameter type-id='type-id-378' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
+      <parameter type-id='type-id-377' name='handler' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <parameter type-id='type-id-41' name='allow_expansion' filepath='../.././libcpp/directives.c' line='1215' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_register_deferred_pragma' mangled-name='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb' filepath='../.././libcpp/directives.c' line='1237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_register_deferred_pragmaP10cpp_readerPKcS2_jbb'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <parameter type-id='type-id-8' name='space' filepath='../.././libcpp/directives.c' line='1237' column='1'/>
       <parameter type-id='type-id-8' name='name' filepath='../.././libcpp/directives.c' line='1238' column='1'/>
       <parameter type-id='type-id-35' name='ident' filepath='../.././libcpp/directives.c' line='1238' column='1'/>
@@ -5121,100 +5120,100 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_init_internal_pragmas' mangled-name='_cpp_init_internal_pragmas' filepath='../.././libcpp/directives.c' line='1254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_internal_pragmas'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_save_pragma_names' mangled-name='_cpp_save_pragma_names' filepath='../.././libcpp/directives.c' line='1304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_pragma_names'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1304' column='1'/>
       <return type-id='type-id-30'/>
     </function-decl>
     <function-decl name='_cpp_restore_pragma_names' mangled-name='_cpp_restore_pragma_names' filepath='../.././libcpp/directives.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_restore_pragma_names'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <parameter type-id='type-id-30' name='saved' filepath='../.././libcpp/directives.c' line='1333' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-35' size-in-bits='64' id='type-id-378'/>
     <function-decl name='_cpp_test_assertion' mangled-name='_cpp_test_assertion' filepath='../.././libcpp/directives.c' line='2225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_test_assertion'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
-      <parameter type-id='type-id-379' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
+      <parameter type-id='type-id-378' name='value' filepath='../.././libcpp/directives.c' line='2225' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <typedef-decl name='cpp_options' type-id='type-id-259' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-380'/>
-    <pointer-type-def type-id='type-id-380' size-in-bits='64' id='type-id-381'/>
+    <typedef-decl name='cpp_options' type-id='type-id-258' filepath='../.././libcpp/include/cpplib.h' line='33' column='1' id='type-id-379'/>
+    <pointer-type-def type-id='type-id-379' size-in-bits='64' id='type-id-380'/>
     <function-decl name='cpp_get_options' mangled-name='_Z15cpp_get_optionsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_get_optionsP10cpp_reader'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
-      <return type-id='type-id-381'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2492' column='1'/>
+      <return type-id='type-id-380'/>
     </function-decl>
-    <typedef-decl name='cpp_callbacks' type-id='type-id-256' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-382'/>
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-383'/>
+    <typedef-decl name='cpp_callbacks' type-id='type-id-255' filepath='../.././libcpp/include/cpplib.h' line='38' column='1' id='type-id-381'/>
+    <pointer-type-def type-id='type-id-381' size-in-bits='64' id='type-id-382'/>
     <function-decl name='cpp_get_callbacks' mangled-name='_Z17cpp_get_callbacksP10cpp_reader' filepath='../.././libcpp/directives.c' line='2499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_get_callbacksP10cpp_reader'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
-      <return type-id='type-id-383'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2499' column='1'/>
+      <return type-id='type-id-382'/>
     </function-decl>
     <function-decl name='cpp_set_callbacks' mangled-name='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks' filepath='../.././libcpp/directives.c' line='2506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_set_callbacksP10cpp_readerP13cpp_callbacks'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
-      <parameter type-id='type-id-383' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
+      <parameter type-id='type-id-382' name='cb' filepath='../.././libcpp/directives.c' line='2506' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_get_deps' mangled-name='_Z12cpp_get_depsP10cpp_reader' filepath='../.././libcpp/directives.c' line='2513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_depsP10cpp_reader'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
-      <return type-id='type-id-254'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2513' column='1'/>
+      <return type-id='type-id-253'/>
     </function-decl>
     <function-decl name='cpp_push_buffer' mangled-name='_Z15cpp_push_bufferP10cpp_readerPKhmi' filepath='../.././libcpp/directives.c' line='2524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_push_bufferP10cpp_readerPKhmi'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
-      <parameter type-id='type-id-270' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
+      <parameter type-id='type-id-269' name='buffer' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/directives.c' line='2524' column='1'/>
       <parameter type-id='type-id-3' name='from_stage3' filepath='../.././libcpp/directives.c' line='2525' column='1'/>
-      <return type-id='type-id-240'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <function-decl name='cpp_unassert' mangled-name='_Z12cpp_unassertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_unassertP10cpp_readerPKc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_assert' mangled-name='_Z10cpp_assertP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_assertP10cpp_readerPKc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_undef' mangled-name='_Z9cpp_undefP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9cpp_undefP10cpp_readerPKc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_define_builtin' mangled-name='_cpp_define_builtin' filepath='../.././libcpp/directives.c' line='2380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_define_builtin'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_define' mangled-name='_Z10cpp_defineP10cpp_readerPKc' filepath='../.././libcpp/directives.c' line='2331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_defineP10cpp_readerPKc'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_define_formatted' mangled-name='_Z20cpp_define_formattedP10cpp_readerPKcz' filepath='../.././libcpp/directives.c' line='2364' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_define_formattedP10cpp_readerPKcz'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter type-id='type-id-8' name='fmt' filepath='../.././libcpp/directives.c' line='2364' column='1'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_init_directives' mangled-name='_cpp_init_directives' filepath='../.././libcpp/directives.c' line='2580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_directives'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_lookup' mangled-name='_Z10cpp_lookupP10cpp_readerPKhj' filepath='../.././libcpp/include/cpplib.h' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_lookupP10cpp_readerPKhj'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-35'/>
       <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='cpp_output_line_to_string' mangled-name='_Z25cpp_output_line_to_stringP10cpp_readerPKh' filepath='../.././libcpp/include/cpplib.h' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_output_line_to_stringP10cpp_readerPKh'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-144'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-146'/>
+      <return type-id='type-id-238'/>
     </function-decl>
     <function-decl name='cpp_warning_with_line_syshdr' mangled-name='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz' filepath='../.././libcpp/include/cpplib.h' line='938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z28cpp_warning_with_line_syshdrP10cpp_readerijjPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-106'/>
       <parameter type-id='type-id-35'/>
@@ -5223,13 +5222,13 @@
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_parse_expr' mangled-name='_cpp_parse_expr' filepath='../.././libcpp/internal.h' line='642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_parse_expr'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-41'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_overlay_buffer' filepath='../.././libcpp/internal.h' line='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -5239,7 +5238,7 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-384'>
+    <enum-decl name='include_type' filepath='../.././libcpp/internal.h' line='120' column='1' id='type-id-383'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='IT_INCLUDE' value='0'/>
       <enumerator name='IT_INCLUDE_NEXT' value='1'/>
@@ -5247,62 +5246,62 @@
       <enumerator name='IT_CMDLINE' value='3'/>
     </enum-decl>
     <function-decl name='_cpp_stack_include' mangled-name='_cpp_stack_include' filepath='../.././libcpp/internal.h' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_include'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-384'/>
+      <parameter type-id='type-id-383'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_compare_file_date' mangled-name='_cpp_compare_file_date' filepath='../.././libcpp/internal.h' line='631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_compare_file_date'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='_cpp_lex_identifier' mangled-name='_cpp_lex_identifier' filepath='../.././libcpp/internal.h' line='655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_lex_identifier'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='_cpp_mark_file_once_only' mangled-name='_cpp_mark_file_once_only' filepath='../.././libcpp/internal.h' line='626' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_mark_file_once_only'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-247'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_make_system_header' mangled-name='_Z22cpp_make_system_headerP10cpp_readerii' filepath='../.././libcpp/include/cpplib.h' line='1006' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_make_system_headerP10cpp_readerii'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-385' size-in-bits='64' id='type-id-386'/>
-    <typedef-decl name='cpp_cb' type-id='type-id-386' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-387'/>
+    <pointer-type-def type-id='type-id-384' size-in-bits='64' id='type-id-385'/>
+    <typedef-decl name='cpp_cb' type-id='type-id-385' filepath='../.././libcpp/include/cpplib.h' line='994' column='1' id='type-id-386'/>
     <function-decl name='cpp_forall_identifiers' mangled-name='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_' filepath='../.././libcpp/include/cpplib.h' line='995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_forall_identifiersP10cpp_readerPFiS0_P12cpp_hashnodePvES3_'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-386'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-325' size-in-bits='64' id='type-id-388'/>
+    <pointer-type-def type-id='type-id-324' size-in-bits='64' id='type-id-387'/>
     <function-decl name='cpp_interpret_string_notranslate' mangled-name='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/include/cpplib.h' line='774' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_interpret_string_notranslateP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-327'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-326'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-388'/>
-      <parameter type-id='type-id-161'/>
+      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-163'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_fake_include' mangled-name='_cpp_fake_include' filepath='../.././libcpp/internal.h' line='627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_fake_include'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='deps_init' mangled-name='_Z9deps_initv' filepath='../.././libcpp/include/mkdeps.h' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_initv'>
-      <return type-id='type-id-254'/>
+      <return type-id='type-id-253'/>
     </function-decl>
     <function-decl name='_cpp_pop_file_buffer' mangled-name='_cpp_pop_file_buffer' filepath='../.././libcpp/internal.h' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_pop_file_buffer'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-247'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='strcspn' filepath='/usr/include/string.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5310,8 +5309,8 @@
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-385'>
-      <parameter type-id='type-id-319' name='pfile'/>
+    <function-type size-in-bits='64' id='type-id-384'>
+      <parameter type-id='type-id-318' name='pfile'/>
       <parameter type-id='type-id-133' name='node'/>
       <parameter type-id='type-id-2' name='v'/>
       <return type-id='type-id-3'/>
@@ -5319,7 +5318,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/errors.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'>
     <function-decl name='cpp_warning_syshdr' mangled-name='_Z18cpp_warning_syshdrP10cpp_readeriPKcz' filepath='../.././libcpp/errors.c' line='121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_warning_syshdrP10cpp_readeriPKcz'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
       <parameter is-variadic='yes'/>
@@ -5343,146 +5342,146 @@
       <return type-id='type-id-35'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-161'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-161'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-161'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
-      <return type-id='type-id-161'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='240' column='1'/>
+      <return type-id='type-id-163'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <return type-id='type-id-41'/>
     </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-161' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/expr.c' line='314' column='1'/>
       <return type-id='type-id-41'/>
     </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'>
-      <parameter type-id='type-id-292' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
+      <parameter type-id='type-id-291' name='tok' filepath='../.././libcpp/expr.c' line='341' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <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-319' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
-      <parameter type-id='type-id-272' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/expr.c' line='364' column='1'/>
+      <parameter type-id='type-id-271' name='ud_suffix' filepath='../.././libcpp/expr.c' line='365' column='1'/>
       <return type-id='type-id-35'/>
     </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-319' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/expr.c' line='635' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/expr.c' line='635' column='1'/>
       <parameter type-id='type-id-35' name='type' filepath='../.././libcpp/expr.c' line='636' column='1'/>
-      <return type-id='type-id-349'/>
+      <return type-id='type-id-348'/>
     </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-319' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
-      <return type-id='type-id-258'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/expr.c' line='1396' column='1'/>
+      <return type-id='type-id-257'/>
     </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-349' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
+      <parameter type-id='type-id-348' name='num' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
       <parameter type-id='type-id-5' name='precision' filepath='../.././libcpp/expr.c' line='1464' column='1'/>
-      <return type-id='type-id-349'/>
+      <return type-id='type-id-348'/>
     </function-decl>
-    <typedef-decl name='cppchar_t' type-id='type-id-35' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-389'/>
+    <typedef-decl name='cppchar_t' type-id='type-id-35' filepath='../.././libcpp/include/cpplib.h' line='269' column='1' id='type-id-388'/>
     <function-decl name='cpp_interpret_charconst' mangled-name='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi' filepath='../.././libcpp/include/cpplib.h' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23cpp_interpret_charconstP10cpp_readerPK9cpp_tokenPjPi'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-292'/>
-      <parameter type-id='type-id-379'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-291'/>
+      <parameter type-id='type-id-378'/>
       <parameter type-id='type-id-62'/>
-      <return type-id='type-id-389'/>
+      <return type-id='type-id-388'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <function-decl name='_cpp_find_failed' mangled-name='_cpp_find_failed' filepath='../.././libcpp/files.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_failed'>
-      <parameter type-id='type-id-248' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
+      <parameter type-id='type-id-247' name='file' filepath='../.././libcpp/files.c' line='432' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_find_file' mangled-name='_cpp_find_file' filepath='../.././libcpp/files.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_find_file'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='452' column='1'/>
-      <parameter type-id='type-id-246' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
+      <parameter type-id='type-id-245' name='start_dir' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <parameter type-id='type-id-41' name='fake' filepath='../.././libcpp/files.c' line='452' column='1'/>
       <parameter type-id='type-id-3' name='angle_brackets' filepath='../.././libcpp/files.c' line='452' column='1'/>
-      <return type-id='type-id-248'/>
+      <return type-id='type-id-247'/>
     </function-decl>
     <function-decl name='_cpp_stack_file' mangled-name='_cpp_stack_file' filepath='../.././libcpp/files.c' line='796' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_stack_file'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
-      <parameter type-id='type-id-248' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='796' column='1'/>
+      <parameter type-id='type-id-247' name='file' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <parameter type-id='type-id-41' name='import' filepath='../.././libcpp/files.c' line='796' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_included' mangled-name='_Z12cpp_includedP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_includedP10cpp_readerPKc'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_included_before' mangled-name='_Z19cpp_included_beforeP10cpp_readerPKcj' filepath='../.././libcpp/files.c' line='1114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19cpp_included_beforeP10cpp_readerPKcj'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='1114' column='1'/>
       <parameter type-id='type-id-106' name='location' filepath='../.././libcpp/files.c' line='1115' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_init_files' mangled-name='_cpp_init_files' filepath='../.././libcpp/files.c' line='1170' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_files'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_cleanup_files' mangled-name='_cpp_cleanup_files' filepath='../.././libcpp/files.c' line='1187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_cleanup_files'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_clear_file_cache' mangled-name='_Z20cpp_clear_file_cacheP10cpp_reader' filepath='../.././libcpp/files.c' line='1200' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_clear_file_cacheP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_change_file' mangled-name='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc' filepath='../.././libcpp/files.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_change_fileP10cpp_reader9lc_reasonPKc'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <parameter type-id='type-id-130' name='reason' filepath='../.././libcpp/files.c' line='1236' column='1'/>
       <parameter type-id='type-id-8' name='new_name' filepath='../.././libcpp/files.c' line='1237' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_report_missing_guards' mangled-name='_cpp_report_missing_guards' filepath='../.././libcpp/files.c' line='1289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_report_missing_guards'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_push_include' mangled-name='_Z16cpp_push_includeP10cpp_readerPKc' filepath='../.././libcpp/files.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_push_includeP10cpp_readerPKc'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/files.c' line='1097' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='cpp_set_include_chains' mangled-name='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i' filepath='../.././libcpp/files.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z22cpp_set_include_chainsP10cpp_readerP7cpp_dirS2_i'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
-      <parameter type-id='type-id-246' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
-      <parameter type-id='type-id-246' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-245' name='quote' filepath='../.././libcpp/files.c' line='1393' column='1'/>
+      <parameter type-id='type-id-245' name='bracket' filepath='../.././libcpp/files.c' line='1393' column='1'/>
       <parameter type-id='type-id-3' name='quote_ignores_source_dir' filepath='../.././libcpp/files.c' line='1394' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_get_path' mangled-name='_Z12cpp_get_pathP9_cpp_file' filepath='../.././libcpp/files.c' line='1603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_pathP9_cpp_file'>
-      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-247'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='cpp_get_dir' mangled-name='_Z11cpp_get_dirP9_cpp_file' filepath='../.././libcpp/files.c' line='1611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_get_dirP9_cpp_file'>
-      <parameter type-id='type-id-248' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
-      <return type-id='type-id-246'/>
+      <parameter type-id='type-id-247' name='f' filepath='../.././libcpp/files.c' line='1611' column='1'/>
+      <return type-id='type-id-245'/>
     </function-decl>
     <function-decl name='cpp_get_prev' mangled-name='_Z12cpp_get_prevP10cpp_buffer' filepath='../.././libcpp/files.c' line='1637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12cpp_get_prevP10cpp_buffer'>
-      <parameter type-id='type-id-240' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
-      <return type-id='type-id-240'/>
+      <parameter type-id='type-id-239' name='b' filepath='../.././libcpp/files.c' line='1637' column='1'/>
+      <return type-id='type-id-239'/>
     </function-decl>
     <function-decl name='_cpp_save_file_entries' mangled-name='_cpp_save_file_entries' filepath='../.././libcpp/files.c' line='1684' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_save_file_entries'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_read_file_entries' mangled-name='_cpp_read_file_entries' filepath='../.././libcpp/files.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_read_file_entries'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/files.c' line='1684' column='1'/>
       <return type-id='type-id-41'/>
     </function-decl>
@@ -5503,7 +5502,7 @@
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='deps_add_dep' mangled-name='_Z12deps_add_depP4depsPKc' filepath='../.././libcpp/include/mkdeps.h' line='56' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_add_depP4depsPKc'>
-      <parameter type-id='type-id-254'/>
+      <parameter type-id='type-id-253'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -5518,35 +5517,35 @@
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-390'/>
-    <typedef-decl name='ssize_t' type-id='type-id-390' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-391'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='180' column='1' id='type-id-389'/>
+    <typedef-decl name='ssize_t' type-id='type-id-389' filepath='/usr/include/stdio.h' line='103' column='1' id='type-id-390'/>
     <function-decl name='read' filepath='/usr/include/unistd.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-391'/>
+      <return type-id='type-id-390'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-392'/>
-    <typedef-decl name='off_t' type-id='type-id-13' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-393'/>
-    <pointer-type-def type-id='type-id-393' size-in-bits='64' id='type-id-394'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-391'/>
+    <typedef-decl name='off_t' type-id='type-id-13' filepath='/usr/include/stdio.h' line='91' column='1' id='type-id-392'/>
+    <pointer-type-def type-id='type-id-392' size-in-bits='64' id='type-id-393'/>
     <function-decl name='_cpp_convert_input' filepath='../.././libcpp/internal.h' line='727' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-239'/>
+      <parameter type-id='type-id-238'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-392'/>
-      <parameter type-id='type-id-394'/>
-      <return type-id='type-id-239'/>
+      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-393'/>
+      <return type-id='type-id-238'/>
     </function-decl>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-395'/>
-    <typedef-decl name='DIR' type-id='type-id-395' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-396'/>
-    <pointer-type-def type-id='type-id-396' size-in-bits='64' id='type-id-397'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-394'/>
+    <typedef-decl name='DIR' type-id='type-id-394' filepath='/usr/include/dirent.h' line='128' column='1' id='type-id-395'/>
+    <pointer-type-def type-id='type-id-395' size-in-bits='64' id='type-id-396'/>
     <function-decl name='opendir' filepath='/usr/include/dirent.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
-      <return type-id='type-id-397'/>
+      <return type-id='type-id-396'/>
     </function-decl>
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-398'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' filepath='/usr/include/bits/dirent.h' line='23' column='1' id='type-id-397'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='d_ino' type-id='type-id-45' visibility='default' filepath='/usr/include/bits/dirent.h' line='26' column='1'/>
       </data-member>
@@ -5560,67 +5559,67 @@
         <var-decl name='d_type' type-id='type-id-132' visibility='default' filepath='/usr/include/bits/dirent.h' line='33' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='152'>
-        <var-decl name='d_name' type-id='type-id-399' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
+        <var-decl name='d_name' type-id='type-id-398' visibility='default' filepath='/usr/include/bits/dirent.h' line='34' column='1'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-399'>
-      <subrange length='256' type-id='type-id-22' id='type-id-400'/>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='2048' id='type-id-398'>
+      <subrange length='256' type-id='type-id-22' id='type-id-399'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-398' size-in-bits='64' id='type-id-401'/>
+    <pointer-type-def type-id='type-id-397' size-in-bits='64' id='type-id-400'/>
     <function-decl name='readdir' filepath='/usr/include/dirent.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-397'/>
-      <return type-id='type-id-401'/>
+      <parameter type-id='type-id-396'/>
+      <return type-id='type-id-400'/>
     </function-decl>
     <function-decl name='closedir' filepath='/usr/include/dirent.h' line='150' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-397'/>
+      <parameter type-id='type-id-396'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='htab_find_with_hash' filepath='../.././libcpp/../include/hashtab.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <parameter type-id='type-id-2'/>
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-175'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <typedef-decl name='__compar_fn_t' type-id='type-id-185' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-402'/>
+    <typedef-decl name='__compar_fn_t' type-id='type-id-187' filepath='/usr/include/stdlib.h' line='742' column='1' id='type-id-401'/>
     <function-decl name='bsearch' filepath='/usr/include/stdlib.h' line='755' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-402'/>
+      <parameter type-id='type-id-401'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='htab_create_alloc' filepath='../.././libcpp/../include/hashtab.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-175'/>
-      <parameter type-id='type-id-176'/>
       <parameter type-id='type-id-177'/>
       <parameter type-id='type-id-178'/>
       <parameter type-id='type-id-179'/>
-      <return type-id='type-id-193'/>
+      <parameter type-id='type-id-180'/>
+      <parameter type-id='type-id-181'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='htab_delete' filepath='../.././libcpp/../include/hashtab.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='qsort' filepath='/usr/include/stdlib.h' line='761' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-402'/>
+      <parameter type-id='type-id-401'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='htab_elements' filepath='../.././libcpp/../include/hashtab.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-403' size-in-bits='64' id='type-id-404'/>
-    <typedef-decl name='htab_trav' type-id='type-id-404' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-405'/>
+    <pointer-type-def type-id='type-id-402' size-in-bits='64' id='type-id-403'/>
+    <typedef-decl name='htab_trav' type-id='type-id-403' filepath='../.././libcpp/../include/hashtab.h' line='69' column='1' id='type-id-404'/>
     <function-decl name='htab_traverse' filepath='../.././libcpp/../include/hashtab.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-405'/>
+      <parameter type-id='type-id-195'/>
+      <parameter type-id='type-id-404'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -5641,7 +5640,7 @@
       <parameter type-id='type-id-27'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-403'>
+    <function-type size-in-bits='64' id='type-id-402'>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-3'/>
@@ -5649,55 +5648,55 @@
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <function-decl name='_cpp_destroy_hashtable' mangled-name='_cpp_destroy_hashtable' filepath='../.././libcpp/identifiers.c' line='80' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_hashtable'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_init_hashtable' mangled-name='_cpp_init_hashtable' filepath='../.././libcpp/identifiers.c' line='48' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_hashtable'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
-      <parameter type-id='type-id-346' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
+      <parameter type-id='type-id-345' name='table' filepath='../.././libcpp/identifiers.c' line='48' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_defined' mangled-name='_Z11cpp_definedP10cpp_readerPKhi' filepath='../.././libcpp/identifiers.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_definedP10cpp_readerPKhi'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
-      <parameter type-id='type-id-144' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
+      <parameter type-id='type-id-146' name='str' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='../.././libcpp/identifiers.c' line='100' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='ht_destroy' mangled-name='_Z10ht_destroyP2ht' filepath='../.././libcpp/include/symtab.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10ht_destroyP2ht'>
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='ht_create' mangled-name='_Z9ht_createj' filepath='../.././libcpp/include/symtab.h' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_createj'>
       <parameter type-id='type-id-35'/>
-      <return type-id='type-id-346'/>
+      <return type-id='type-id-345'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-406' size-in-bits='64' id='type-id-407'/>
-    <typedef-decl name='ht_cb' type-id='type-id-407' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-408'/>
+    <pointer-type-def type-id='type-id-405' size-in-bits='64' id='type-id-406'/>
+    <typedef-decl name='ht_cb' type-id='type-id-406' filepath='../.././libcpp/include/symtab.h' line='90' column='1' id='type-id-407'/>
     <function-decl name='ht_forall' mangled-name='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/include/symtab.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9ht_forallP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
-      <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-408'/>
+      <parameter type-id='type-id-345'/>
+      <parameter type-id='type-id-407'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-406'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-344'/>
+    <function-type size-in-bits='64' id='type-id-405'>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-343'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-3'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/lex.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'>
     <function-decl name='cpp_ideq' mangled-name='_Z8cpp_ideqPK9cpp_tokenPKc' filepath='../.././libcpp/lex.c' line='74' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8cpp_ideqPK9cpp_tokenPKc'>
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <parameter type-id='type-id-8' name='string' filepath='../.././libcpp/lex.c' line='74' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='_cpp_init_lexer' mangled-name='_cpp_init_lexer' filepath='../.././libcpp/lex.c' line='645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_lexer'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-409'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='972' column='1' id='type-id-408'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='entries' type-id='type-id-356' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='974' column='1'/>
+        <var-decl name='entries' type-id='type-id-355' 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-3' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='977' column='1'/>
@@ -5706,7 +5705,7 @@
         <var-decl name='allocated' type-id='type-id-3' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='980' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-410'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='961' column='1' id='type-id-409'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='comment' type-id='type-id-9' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='963' column='1'/>
       </data-member>
@@ -5714,43 +5713,43 @@
         <var-decl name='sloc' type-id='type-id-106' visibility='default' filepath='../.././libcpp/include/cpplib.h' line='966' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-262' size-in-bits='64' id='type-id-411'/>
+    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-410'/>
     <function-decl name='cpp_get_comments' mangled-name='_Z16cpp_get_commentsP10cpp_reader' filepath='../.././libcpp/lex.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_get_commentsP10cpp_reader'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
-      <return type-id='type-id-411'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='1627' column='1'/>
+      <return type-id='type-id-410'/>
     </function-decl>
     <function-decl name='_cpp_init_tokenrun' mangled-name='_cpp_init_tokenrun' filepath='../.././libcpp/lex.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_init_tokenrun'>
-      <parameter type-id='type-id-252' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
+      <parameter type-id='type-id-251' name='run' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <parameter type-id='type-id-35' name='count' filepath='../.././libcpp/lex.c' line='1721' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <typedef-decl name='cpp_context' type-id='type-id-243' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-412'/>
+    <typedef-decl name='cpp_context' type-id='type-id-242' filepath='../.././libcpp/internal.h' line='176' column='1' id='type-id-411'/>
     <function-decl name='_cpp_remaining_tokens_num_in_context' mangled-name='_cpp_remaining_tokens_num_in_context' filepath='../.././libcpp/lex.c' line='1745' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_remaining_tokens_num_in_context'>
-      <parameter type-id='type-id-244' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
+      <parameter type-id='type-id-243' name='context' filepath='../.././libcpp/lex.c' line='1745' column='1'/>
       <return type-id='type-id-3'/>
     </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-161' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
+      <parameter type-id='type-id-163' name='type' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <parameter type-id='type-id-132' name='flags' filepath='../.././libcpp/lex.c' line='2496' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='cpp_output_token' mangled-name='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_output_tokenPK9cpp_tokenP8_IO_FILE'>
-      <parameter type-id='type-id-292' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
+      <parameter type-id='type-id-291' name='token' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/lex.c' line='2510' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_avoid_paste' mangled-name='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_' filepath='../.././libcpp/lex.c' line='2592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_avoid_pasteP10cpp_readerPK9cpp_tokenS3_'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
-      <parameter type-id='type-id-292' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
-      <parameter type-id='type-id-292' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-291' name='token1' filepath='../.././libcpp/lex.c' line='2592' column='1'/>
+      <parameter type-id='type-id-291' name='token2' filepath='../.././libcpp/lex.c' line='2593' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='cpp_output_line' mangled-name='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/lex.c' line='2649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15cpp_output_lineP10cpp_readerP8_IO_FILE'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-413'>
+    <enum-decl name='cpp_token_fld_kind' filepath='../.././libcpp/include/cpplib.h' line='195' column='1' id='type-id-412'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='CPP_TOKEN_FLD_NODE' value='0'/>
       <enumerator name='CPP_TOKEN_FLD_SOURCE' value='1'/>
@@ -5761,51 +5760,51 @@
       <enumerator name='CPP_TOKEN_FLD_NONE' value='6'/>
     </enum-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-155' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
-      <return type-id='type-id-413'/>
+      <parameter type-id='type-id-157' name='tok' filepath='../.././libcpp/lex.c' line='2879' column='1'/>
+      <return type-id='type-id-412'/>
     </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'>
-      <parameter type-id='type-id-319' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
+      <parameter type-id='type-id-318' name='r' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <parameter type-id='type-id-134' name='p' filepath='../.././libcpp/lex.c' line='2910' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_stop_forcing_token_locations' mangled-name='_Z32cpp_stop_forcing_token_locationsP10cpp_reader' filepath='../.././libcpp/lex.c' line='2918' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z32cpp_stop_forcing_token_locationsP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <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-414'>
+    <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-413'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='previous' type-id='type-id-389' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
+        <var-decl name='previous' type-id='type-id-388' visibility='default' filepath='../.././libcpp/internal.h' line='709' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
         <var-decl name='prev_class' type-id='type-id-132' 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-353' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
+        <var-decl name='level' type-id='type-id-352' visibility='default' filepath='../.././libcpp/internal.h' line='713' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-414' size-in-bits='64' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-413' size-in-bits='64' id='type-id-414'/>
     <function-decl name='_cpp_valid_ucn' filepath='../.././libcpp/internal.h' line='723' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-392'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-391'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-415'/>
-      <return type-id='type-id-389'/>
+      <parameter type-id='type-id-414'/>
+      <return type-id='type-id-388'/>
     </function-decl>
     <function-decl name='_cpp_interpret_identifier' filepath='../.././libcpp/internal.h' line='731' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='ht_lookup_with_hash' mangled-name='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option' filepath='../.././libcpp/include/symtab.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z19ht_lookup_with_hashP2htPKhmj16ht_lookup_option'>
-      <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-345'/>
+      <parameter type-id='type-id-146'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-35'/>
-      <parameter type-id='type-id-377'/>
-      <return type-id='type-id-344'/>
+      <parameter type-id='type-id-376'/>
+      <return type-id='type-id-343'/>
     </function-decl>
     <function-decl name='memmove' filepath='/usr/include/string.h' line='49' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
@@ -5814,51 +5813,51 @@
       <return type-id='type-id-2'/>
     </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-161'/>
+      <parameter type-id='type-id-163'/>
       <return type-id='type-id-8'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <function-decl name='deps_free' mangled-name='_Z9deps_freeP4deps' filepath='../.././libcpp/mkdeps.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_freeP4deps'>
-      <parameter type-id='type-id-254' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
+      <parameter type-id='type-id-253' name='d' filepath='../.././libcpp/mkdeps.c' line='174' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='deps_add_target' mangled-name='_Z15deps_add_targetP4depsPKci' filepath='../.././libcpp/mkdeps.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z15deps_add_targetP4depsPKci'>
-      <parameter type-id='type-id-254' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
+      <parameter type-id='type-id-253' name='d' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <parameter type-id='type-id-8' name='t' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <parameter type-id='type-id-3' name='quote' filepath='../.././libcpp/mkdeps.c' line='206' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='deps_add_default_target' mangled-name='_Z23deps_add_default_targetP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z23deps_add_default_targetP4depsPKc'>
-      <parameter type-id='type-id-254'/>
+      <parameter type-id='type-id-253'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='deps_add_vpath' mangled-name='_Z14deps_add_vpathP4depsPKc' filepath='../.././libcpp/mkdeps.c' line='270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14deps_add_vpathP4depsPKc'>
-      <parameter type-id='type-id-254'/>
+      <parameter type-id='type-id-253'/>
       <parameter type-id='type-id-8'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-302' const='yes' id='type-id-416'/>
-    <pointer-type-def type-id='type-id-416' size-in-bits='64' id='type-id-417'/>
+    <qualified-type-def type-id='type-id-301' const='yes' id='type-id-415'/>
+    <pointer-type-def type-id='type-id-415' size-in-bits='64' id='type-id-416'/>
     <function-decl name='deps_write' mangled-name='_Z10deps_writePK4depsP8_IO_FILEj' filepath='../.././libcpp/mkdeps.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10deps_writePK4depsP8_IO_FILEj'>
-      <parameter type-id='type-id-417' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
+      <parameter type-id='type-id-416' name='d' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <parameter type-id='type-id-35' name='colmax' filepath='../.././libcpp/mkdeps.c' line='299' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='deps_phony_targets' mangled-name='_Z18deps_phony_targetsPK4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18deps_phony_targetsPK4depsP8_IO_FILE'>
-      <parameter type-id='type-id-417' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
+      <parameter type-id='type-id-416' name='d' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/mkdeps.c' line='350' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='deps_save' mangled-name='_Z9deps_saveP4depsP8_IO_FILE' filepath='../.././libcpp/mkdeps.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z9deps_saveP4depsP8_IO_FILE'>
-      <parameter type-id='type-id-254' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
+      <parameter type-id='type-id-253' name='deps' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <parameter type-id='type-id-27' name='f' filepath='../.././libcpp/mkdeps.c' line='368' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='deps_restore' mangled-name='_Z12deps_restoreP4depsP8_IO_FILEPKc' filepath='../.././libcpp/mkdeps.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z12deps_restoreP4depsP8_IO_FILEPKc'>
-      <parameter type-id='type-id-254' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
+      <parameter type-id='type-id-253' name='deps' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <parameter type-id='type-id-27' name='fd' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <parameter type-id='type-id-8' name='self' filepath='../.././libcpp/mkdeps.c' line='397' column='1'/>
       <return type-id='type-id-3'/>
@@ -5866,21 +5865,21 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/symtab.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'>
     <function-decl name='ht_purge' mangled-name='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_' filepath='../.././libcpp/symtab.c' line='245' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z8ht_purgeP2htPFiP10cpp_readerP13ht_identifierPKvES6_'>
-      <parameter type-id='type-id-346'/>
-      <parameter type-id='type-id-408'/>
+      <parameter type-id='type-id-345'/>
+      <parameter type-id='type-id-407'/>
       <parameter type-id='type-id-2'/>
       <return type-id='type-id-1'/>
     </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-346' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
-      <parameter type-id='type-id-341' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-345' name='ht' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
+      <parameter type-id='type-id-340' name='entries' filepath='../.././libcpp/symtab.c' line='262' column='1'/>
       <parameter type-id='type-id-35' name='nslots' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <parameter type-id='type-id-35' name='nelements' filepath='../.././libcpp/symtab.c' line='263' column='1'/>
       <parameter type-id='type-id-41' name='own' filepath='../.././libcpp/symtab.c' line='264' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='ht_dump_statistics' mangled-name='_Z18ht_dump_statisticsP2ht' filepath='../.././libcpp/symtab.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18ht_dump_statisticsP2ht'>
-      <parameter type-id='type-id-346'/>
+      <parameter type-id='type-id-345'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_obstack_memory_used' filepath='../.././libcpp/../include/obstack.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -5890,50 +5889,50 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libcpp/charset.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'>
     <function-decl name='cpp_init_iconv' mangled-name='_Z14cpp_init_iconvP10cpp_reader' filepath='../.././libcpp/charset.c' line='700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z14cpp_init_iconvP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_cpp_destroy_iconv' mangled-name='_cpp_destroy_iconv' filepath='../.././libcpp/charset.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_destroy_iconv'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_host_to_exec_charset' mangled-name='_Z24cpp_host_to_exec_charsetP10cpp_readerj' filepath='../.././libcpp/charset.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z24cpp_host_to_exec_charsetP10cpp_readerj'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
-      <parameter type-id='type-id-389' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
-      <return type-id='type-id-389'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <parameter type-id='type-id-388' name='c' filepath='../.././libcpp/charset.c' line='770' column='1'/>
+      <return type-id='type-id-388'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-418'/>
+    <pointer-type-def type-id='type-id-269' size-in-bits='64' id='type-id-417'/>
     <function-decl name='_cpp_valid_ucn' mangled-name='_cpp_valid_ucn' filepath='../.././libcpp/charset.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_valid_ucn'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
-      <parameter type-id='type-id-418' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
-      <parameter type-id='type-id-270' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-417' name='pstr' filepath='../.././libcpp/charset.c' line='983' column='1'/>
+      <parameter type-id='type-id-269' name='limit' filepath='../.././libcpp/charset.c' line='984' column='1'/>
       <parameter type-id='type-id-3' name='identifier_pos' filepath='../.././libcpp/charset.c' line='984' column='1'/>
-      <parameter type-id='type-id-415' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
-      <return type-id='type-id-389'/>
+      <parameter type-id='type-id-414' name='nst' filepath='../.././libcpp/charset.c' line='985' column='1'/>
+      <return type-id='type-id-388'/>
     </function-decl>
     <function-decl name='cpp_interpret_string' mangled-name='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype' filepath='../.././libcpp/charset.c' line='1371' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z20cpp_interpret_stringP10cpp_readerPK10cpp_stringmPS1_9cpp_ttype'>
-      <parameter type-id='type-id-319'/>
-      <parameter type-id='type-id-327'/>
+      <parameter type-id='type-id-318'/>
+      <parameter type-id='type-id-326'/>
       <parameter type-id='type-id-5'/>
-      <parameter type-id='type-id-388'/>
-      <parameter type-id='type-id-161'/>
+      <parameter type-id='type-id-387'/>
+      <parameter type-id='type-id-163'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='_cpp_interpret_identifier' mangled-name='_cpp_interpret_identifier' filepath='../.././libcpp/charset.c' line='1634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_interpret_identifier'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
-      <parameter type-id='type-id-270' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
+      <parameter type-id='type-id-269' name='id' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/charset.c' line='1634' column='1'/>
       <return type-id='type-id-133'/>
     </function-decl>
     <function-decl name='_cpp_convert_input' mangled-name='_cpp_convert_input' filepath='../.././libcpp/charset.c' line='1698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_convert_input'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
       <parameter type-id='type-id-8' name='input_charset' filepath='../.././libcpp/charset.c' line='1698' column='1'/>
-      <parameter type-id='type-id-362' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
+      <parameter type-id='type-id-361' name='input' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <parameter type-id='type-id-5' name='size' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libcpp/charset.c' line='1699' column='1'/>
-      <parameter type-id='type-id-392' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
-      <parameter type-id='type-id-394' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
-      <return type-id='type-id-362'/>
+      <parameter type-id='type-id-391' name='buffer_start' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <parameter type-id='type-id-393' name='st_size' filepath='../.././libcpp/charset.c' line='1700' column='1'/>
+      <return type-id='type-id-361'/>
     </function-decl>
     <function-decl name='_cpp_default_encoding' mangled-name='_cpp_default_encoding' filepath='../.././libcpp/charset.c' line='1767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_cpp_default_encoding'>
       <return type-id='type-id-8'/>
@@ -5941,54 +5940,54 @@
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <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-319' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
-      <parameter type-id='type-id-352' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/init.c' line='108' column='1'/>
+      <parameter type-id='type-id-351' name='lang' filepath='../.././libcpp/init.c' line='108' column='1'/>
       <return type-id='type-id-1'/>
     </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-352' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
-      <parameter type-id='type-id-346' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
-      <parameter type-id='type-id-206' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
-      <return type-id='type-id-319'/>
+      <parameter type-id='type-id-351' name='lang' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-345' name='table' filepath='../.././libcpp/init.c' line='152' column='1'/>
+      <parameter type-id='type-id-208' name='line_table' filepath='../.././libcpp/init.c' line='153' column='1'/>
+      <return type-id='type-id-318'/>
     </function-decl>
     <function-decl name='cpp_set_line_map' mangled-name='_Z16cpp_set_line_mapP10cpp_readerP9line_maps' filepath='../.././libcpp/init.c' line='252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_set_line_mapP10cpp_readerP9line_maps'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
-      <parameter type-id='type-id-206' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/init.c' line='252' column='1'/>
+      <parameter type-id='type-id-208' name='line_table' filepath='../.././libcpp/init.c' line='252' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_destroy' mangled-name='_Z11cpp_destroyP10cpp_reader' filepath='../.././libcpp/init.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z11cpp_destroyP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_init_special_builtins' mangled-name='_Z25cpp_init_special_builtinsP10cpp_reader' filepath='../.././libcpp/init.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z25cpp_init_special_builtinsP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_init_builtins' mangled-name='_Z17cpp_init_builtinsP10cpp_readeri' filepath='../.././libcpp/init.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z17cpp_init_builtinsP10cpp_readeri'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_post_options' mangled-name='_Z16cpp_post_optionsP10cpp_reader' filepath='../.././libcpp/init.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z16cpp_post_optionsP10cpp_reader'>
-      <parameter type-id='type-id-319'/>
+      <parameter type-id='type-id-318'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cpp_read_main_file' mangled-name='_Z18cpp_read_main_fileP10cpp_readerPKc' filepath='../.././libcpp/init.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z18cpp_read_main_fileP10cpp_readerPKc'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <parameter type-id='type-id-8' name='fname' filepath='../.././libcpp/init.c' line='577' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
     <function-decl name='cpp_finish' mangled-name='_Z10cpp_finishP10cpp_readerP8_IO_FILE' filepath='../.././libcpp/init.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_Z10cpp_finishP10cpp_readerP8_IO_FILE'>
-      <parameter type-id='type-id-319' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
+      <parameter type-id='type-id-318' name='pfile' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <parameter type-id='type-id-27' name='fp' filepath='../.././libcpp/lex.c' line='2649' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-132' size-in-bits='2048' id='type-id-419'>
-      <subrange length='256' type-id='type-id-22' id='type-id-400'/>
+    <array-type-def dimensions='1' type-id='type-id-145' size-in-bits='2048' id='type-id-418'>
+      <subrange length='256' type-id='type-id-22' id='type-id-399'/>
 
     </array-type-def>
-    <var-decl name='_cpp_trigraph_map' type-id='type-id-419' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
+    <var-decl name='_cpp_trigraph_map' type-id='type-id-418' mangled-name='_cpp_trigraph_map' visibility='default' filepath='../.././libcpp/init.c' line='60' column='1' elf-symbol-id='_cpp_trigraph_map'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cplus-dem.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='set_cplus_marker_for_demangling' mangled-name='set_cplus_marker_for_demangling' filepath='../.././libiberty/cplus-dem.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_cplus_marker_for_demangling'>
@@ -6000,7 +5999,7 @@
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cplus-dem.c' line='765' column='1'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-420'>
+    <enum-decl name='demangling_styles' filepath='../.././libiberty/../include/demangle.h' line='78' column='1' id='type-id-419'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='no_demangling' value='-1'/>
       <enumerator name='unknown_demangling' value='0'/>
@@ -6015,12 +6014,12 @@
       <enumerator name='gnat_demangling' value='32768'/>
     </enum-decl>
     <function-decl name='cplus_demangle_set_style' mangled-name='cplus_demangle_set_style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_set_style'>
-      <parameter type-id='type-id-420' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
-      <return type-id='type-id-420'/>
+      <parameter type-id='type-id-419' name='style' filepath='../.././libiberty/cplus-dem.c' line='785' column='1'/>
+      <return type-id='type-id-419'/>
     </function-decl>
     <function-decl name='cplus_demangle_name_to_style' mangled-name='cplus_demangle_name_to_style' filepath='../.././libiberty/cplus-dem.c' line='802' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_name_to_style'>
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/cplus-dem.c' line='802' column='1'/>
-      <return type-id='type-id-420'/>
+      <return type-id='type-id-419'/>
     </function-decl>
     <function-decl name='ada_demangle' mangled-name='ada_demangle' filepath='../.././libiberty/cplus-dem.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ada_demangle'>
       <parameter type-id='type-id-8' name='mangled' filepath='../.././libiberty/cplus-dem.c' line='881' column='1'/>
@@ -6033,27 +6032,27 @@
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cplus-dem.c' line='632' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <var-decl name='current_demangling_style' type-id='type-id-420' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
-    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-421'>
+    <var-decl name='current_demangling_style' type-id='type-id-419' mangled-name='current_demangling_style' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='93' column='1' elf-symbol-id='current_demangling_style'/>
+    <class-decl name='demangler_engine' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='122' column='1' id='type-id-420'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='demangling_style_name' type-id='type-id-422' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
+        <var-decl name='demangling_style_name' type-id='type-id-421' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='124' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='demangling_style' type-id='type-id-423' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
+        <var-decl name='demangling_style' type-id='type-id-422' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='125' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='demangling_style_doc' type-id='type-id-422' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
+        <var-decl name='demangling_style_doc' type-id='type-id-421' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='126' column='1'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-422'/>
-    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-423'/>
+    <qualified-type-def type-id='type-id-8' const='yes' id='type-id-421'/>
+    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-422'/>
 
-    <array-type-def dimensions='1' type-id='type-id-421' size-in-bits='2112' id='type-id-424'>
+    <array-type-def dimensions='1' type-id='type-id-423' size-in-bits='2112' id='type-id-424'>
       <subrange length='11' type-id='type-id-22' id='type-id-425'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-424' const='yes' id='type-id-426'/>
-    <var-decl name='libiberty_demanglers' type-id='type-id-426' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
+    <qualified-type-def type-id='type-id-420' const='yes' id='type-id-423'/>
+    <var-decl name='libiberty_demanglers' type-id='type-id-424' mangled-name='libiberty_demanglers' visibility='default' filepath='../.././libiberty/cplus-dem.c' line='246' column='1' elf-symbol-id='libiberty_demanglers'/>
     <function-decl name='__builtin_strcmp' mangled-name='strcmp' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-8'/>
@@ -6117,15 +6116,15 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/cp-demangle.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-427'>
+    <class-decl name='demangle_component' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='434' column='1' id='type-id-426'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-428' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
+        <var-decl name='type' type-id='type-id-427' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='437' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='u' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
+        <var-decl name='u' type-id='type-id-428' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='541' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-428'>
+    <enum-decl name='demangle_component_type' filepath='../.././libiberty/../include/demangle.h' line='215' column='1' id='type-id-427'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='DEMANGLE_COMPONENT_NAME' value='0'/>
       <enumerator name='DEMANGLE_COMPONENT_QUAL_NAME' value='1'/>
@@ -6199,45 +6198,45 @@
       <enumerator name='DEMANGLE_COMPONENT_PACK_EXPANSION' value='69'/>
       <enumerator name='DEMANGLE_COMPONENT_CLONE' value='70'/>
     </enum-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-429'>
+    <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='439' column='1' id='type-id-428'>
       <data-member access='private'>
-        <var-decl name='s_name' type-id='type-id-430' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
+        <var-decl name='s_name' type-id='type-id-429' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='448' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_operator' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
+        <var-decl name='s_operator' type-id='type-id-430' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='455' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_extended_operator' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
+        <var-decl name='s_extended_operator' type-id='type-id-431' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='464' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_fixed' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
+        <var-decl name='s_fixed' type-id='type-id-432' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='475' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_ctor' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
+        <var-decl name='s_ctor' type-id='type-id-433' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='484' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_dtor' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
+        <var-decl name='s_dtor' type-id='type-id-434' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='493' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_builtin' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
+        <var-decl name='s_builtin' type-id='type-id-435' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='500' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_string' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
+        <var-decl name='s_string' type-id='type-id-436' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='509' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_number' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
+        <var-decl name='s_number' type-id='type-id-437' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='516' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_character' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
+        <var-decl name='s_character' type-id='type-id-438' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='522' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_binary' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
+        <var-decl name='s_binary' type-id='type-id-439' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='531' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='s_unary_num' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
+        <var-decl name='s_unary_num' type-id='type-id-440' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='539' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-430'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='442' column='1' id='type-id-429'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='s' type-id='type-id-8' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='446' column='1'/>
       </data-member>
@@ -6245,12 +6244,12 @@
         <var-decl name='len' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='447' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-431'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='451' column='1' id='type-id-430'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-442' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
+        <var-decl name='op' type-id='type-id-441' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='454' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-443'>
+    <class-decl name='demangle_operator_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='37' column='1' id='type-id-442'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='code' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='40' column='1'/>
       </data-member>
@@ -6264,65 +6263,65 @@
         <var-decl name='args' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='46' column='1'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-443' const='yes' id='type-id-444'/>
-    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-442'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-432'>
+    <qualified-type-def type-id='type-id-442' const='yes' id='type-id-443'/>
+    <pointer-type-def type-id='type-id-443' size-in-bits='64' id='type-id-441'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='458' column='1' id='type-id-431'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='args' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='461' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
+        <var-decl name='name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='463' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-427' size-in-bits='64' id='type-id-445'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-433'>
+    <pointer-type-def type-id='type-id-426' size-in-bits='64' id='type-id-444'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='467' column='1' id='type-id-432'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='length' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
+        <var-decl name='length' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='470' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='accum' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
+        <var-decl name='accum' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='472' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='80'>
-        <var-decl name='sat' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
+        <var-decl name='sat' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='474' column='1'/>
       </data-member>
     </class-decl>
-    <type-decl name='short int' size-in-bits='16' id='type-id-446'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-434'>
+    <type-decl name='short int' size-in-bits='16' id='type-id-445'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='478' column='1' id='type-id-433'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kind' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
+        <var-decl name='kind' type-id='type-id-446' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='481' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
+        <var-decl name='name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='483' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-447'>
+    <enum-decl name='gnu_v3_ctor_kinds' filepath='../.././libiberty/../include/demangle.h' line='172' column='1' id='type-id-446'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='gnu_v3_complete_object_ctor' value='1'/>
       <enumerator name='gnu_v3_base_object_ctor' value='2'/>
       <enumerator name='gnu_v3_complete_object_allocating_ctor' value='3'/>
       <enumerator name='gnu_v3_object_ctor_group' value='4'/>
     </enum-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-435'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='487' column='1' id='type-id-434'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='kind' type-id='type-id-448' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
+        <var-decl name='kind' type-id='type-id-447' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='490' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
+        <var-decl name='name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='492' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-448'>
+    <enum-decl name='gnu_v3_dtor_kinds' filepath='../.././libiberty/../include/demangle.h' line='187' column='1' id='type-id-447'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='gnu_v3_deleting_dtor' value='1'/>
       <enumerator name='gnu_v3_complete_object_dtor' value='2'/>
       <enumerator name='gnu_v3_base_object_dtor' value='3'/>
       <enumerator name='gnu_v3_object_dtor_group' value='4'/>
     </enum-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-436'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='496' column='1' id='type-id-435'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='type' type-id='type-id-449' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
+        <var-decl name='type' type-id='type-id-448' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='499' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-450'>
+    <class-decl name='demangle_builtin_type_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='77' column='1' id='type-id-449'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='name' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='80' column='1'/>
       </data-member>
@@ -6336,10 +6335,10 @@
         <var-decl name='java_len' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='86' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='print' type-id='type-id-451' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
+        <var-decl name='print' type-id='type-id-450' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='88' column='1'/>
       </data-member>
     </class-decl>
-    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-451'>
+    <enum-decl name='d_builtin_type_print' filepath='../.././libiberty/cp-demangle.h' line='51' column='1' id='type-id-450'>
       <underlying-type type-id='type-id-92'/>
       <enumerator name='D_PRINT_DEFAULT' value='0'/>
       <enumerator name='D_PRINT_INT' value='1'/>
@@ -6352,9 +6351,9 @@
       <enumerator name='D_PRINT_FLOAT' value='8'/>
       <enumerator name='D_PRINT_VOID' value='9'/>
     </enum-decl>
-    <qualified-type-def type-id='type-id-450' const='yes' id='type-id-452'/>
-    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-449'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-437'>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-451'/>
+    <pointer-type-def type-id='type-id-451' size-in-bits='64' id='type-id-448'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='503' column='1' id='type-id-436'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='string' type-id='type-id-8' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='506' column='1'/>
       </data-member>
@@ -6362,57 +6361,57 @@
         <var-decl name='len' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='508' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-438'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='512' column='1' id='type-id-437'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='number' type-id='type-id-21' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='515' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-439'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='519' column='1' id='type-id-438'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='character' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='521' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-440'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='525' column='1' id='type-id-439'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='left' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
+        <var-decl name='left' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='528' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='right' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
+        <var-decl name='right' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='530' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-441'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='533' column='1' id='type-id-440'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sub' type-id='type-id-445' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
+        <var-decl name='sub' type-id='type-id-444' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='536' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='num' type-id='type-id-3' visibility='default' filepath='../.././libiberty/../include/demangle.h' line='538' column='1'/>
       </data-member>
     </class-decl>
     <function-decl name='cplus_demangle_fill_name' mangled-name='cplus_demangle_fill_name' filepath='../.././libiberty/cp-demangle.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_name'>
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <parameter type-id='type-id-8' name='s' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <parameter type-id='type-id-3' name='len' filepath='../.././libiberty/cp-demangle.c' line='711' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='cplus_demangle_fill_extended_operator' mangled-name='cplus_demangle_fill_extended_operator' filepath='../.././libiberty/cp-demangle.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_extended_operator'>
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
       <parameter type-id='type-id-3' name='args' filepath='../.././libiberty/cp-demangle.c' line='725' column='1'/>
-      <parameter type-id='type-id-445' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
+      <parameter type-id='type-id-444' name='name' filepath='../.././libiberty/cp-demangle.c' line='726' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='cplus_demangle_fill_ctor' mangled-name='cplus_demangle_fill_ctor' filepath='../.././libiberty/cp-demangle.c' line='740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_ctor'>
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
-      <parameter type-id='type-id-447' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
-      <parameter type-id='type-id-445' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='740' column='1'/>
+      <parameter type-id='type-id-446' name='kind' filepath='../.././libiberty/cp-demangle.c' line='741' column='1'/>
+      <parameter type-id='type-id-444' name='name' filepath='../.././libiberty/cp-demangle.c' line='742' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='cplus_demangle_fill_dtor' mangled-name='cplus_demangle_fill_dtor' filepath='../.././libiberty/cp-demangle.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_fill_dtor'>
-      <parameter type-id='type-id-445' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
-      <parameter type-id='type-id-448' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
-      <parameter type-id='type-id-445' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
+      <parameter type-id='type-id-444' name='p' filepath='../.././libiberty/cp-demangle.c' line='759' column='1'/>
+      <parameter type-id='type-id-447' name='kind' filepath='../.././libiberty/cp-demangle.c' line='760' column='1'/>
+      <parameter type-id='type-id-444' name='name' filepath='../.././libiberty/cp-demangle.c' line='761' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-453'>
+    <class-decl name='d_info' size-in-bits='704' is-struct='yes' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='93' column='1' id='type-id-452'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='s' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='96' column='1'/>
       </data-member>
@@ -6426,7 +6425,7 @@
         <var-decl name='n' type-id='type-id-8' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='102' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='comps' type-id='type-id-445' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
+        <var-decl name='comps' type-id='type-id-444' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='104' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
         <var-decl name='next_comp' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='106' column='1'/>
@@ -6435,7 +6434,7 @@
         <var-decl name='num_comps' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='108' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='subs' type-id='type-id-454' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
+        <var-decl name='subs' type-id='type-id-453' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='110' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='next_sub' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='112' column='1'/>
@@ -6447,89 +6446,89 @@
         <var-decl name='did_subs' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='118' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='last_name' type-id='type-id-445' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
+        <var-decl name='last_name' type-id='type-id-444' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='120' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='expansion' type-id='type-id-3' visibility='default' filepath='../.././libiberty/cp-demangle.h' line='124' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-445' size-in-bits='64' id='type-id-454'/>
-    <pointer-type-def type-id='type-id-453' size-in-bits='64' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-444' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-452' size-in-bits='64' id='type-id-454'/>
     <function-decl name='cplus_demangle_type' mangled-name='cplus_demangle_type' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_type'>
-      <parameter type-id='type-id-455' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
-      <return type-id='type-id-445'/>
+      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='2092' column='1'/>
+      <return type-id='type-id-444'/>
     </function-decl>
     <function-decl name='cplus_demangle_mangled_name' mangled-name='cplus_demangle_mangled_name' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_mangled_name'>
-      <parameter type-id='type-id-455' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
+      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
       <parameter type-id='type-id-3' name='top_level' filepath='../.././libiberty/cp-demangle.c' line='1063' column='1'/>
-      <return type-id='type-id-445'/>
+      <return type-id='type-id-444'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-427' const='yes' id='type-id-456'/>
-    <pointer-type-def type-id='type-id-456' size-in-bits='64' id='type-id-457'/>
-    <pointer-type-def type-id='type-id-458' size-in-bits='64' id='type-id-459'/>
-    <typedef-decl name='demangle_callbackref' type-id='type-id-459' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-460'/>
+    <qualified-type-def type-id='type-id-426' const='yes' id='type-id-455'/>
+    <pointer-type-def type-id='type-id-455' size-in-bits='64' id='type-id-456'/>
+    <pointer-type-def type-id='type-id-457' size-in-bits='64' id='type-id-458'/>
+    <typedef-decl name='demangle_callbackref' type-id='type-id-458' filepath='../.././libiberty/../include/demangle.h' line='150' column='1' id='type-id-459'/>
     <function-decl name='cplus_demangle_print_callback' mangled-name='cplus_demangle_print_callback' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print_callback'>
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='3603' column='1'/>
-      <parameter type-id='type-id-457' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
-      <parameter type-id='type-id-460' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
+      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3604' column='1'/>
+      <parameter type-id='type-id-459' name='callback' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <parameter type-id='type-id-2' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='3605' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='cplus_demangle_print' mangled-name='cplus_demangle_print' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_print'>
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
-      <parameter type-id='type-id-457' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
+      <parameter type-id='type-id-456' name='dc' filepath='../.././libiberty/cp-demangle.c' line='3628' column='1'/>
       <parameter type-id='type-id-3' name='estimate' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
-      <parameter type-id='type-id-217' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
+      <parameter type-id='type-id-219' name='palc' filepath='../.././libiberty/cp-demangle.c' line='3629' column='1'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <function-decl name='cplus_demangle_init_info' mangled-name='cplus_demangle_init_info' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_init_info'>
       <parameter type-id='type-id-8' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libiberty/cp-demangle.c' line='5131' column='1'/>
-      <parameter type-id='type-id-455' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
+      <parameter type-id='type-id-454' name='di' filepath='../.././libiberty/cp-demangle.c' line='5132' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='cplus_demangle_v3_callback' mangled-name='cplus_demangle_v3_callback' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cplus_demangle_v3_callback'>
       <parameter type-id='type-id-8' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
       <parameter type-id='type-id-3' name='options' filepath='../.././libiberty/cp-demangle.c' line='5422' column='1'/>
-      <parameter type-id='type-id-460' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
+      <parameter type-id='type-id-459' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <parameter type-id='type-id-2' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5423' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='java_demangle_v3_callback' mangled-name='java_demangle_v3_callback' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='java_demangle_v3_callback'>
       <parameter type-id='type-id-8' name='mangled' filepath='../.././libiberty/cp-demangle.c' line='5443' column='1'/>
-      <parameter type-id='type-id-460' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
+      <parameter type-id='type-id-459' name='callback' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <parameter type-id='type-id-2' name='opaque' filepath='../.././libiberty/cp-demangle.c' line='5444' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
     <function-decl name='is_gnu_v3_mangled_ctor' mangled-name='is_gnu_v3_mangled_ctor' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_ctor'>
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/cp-demangle.c' line='5530' column='1'/>
-      <return type-id='type-id-447'/>
+      <return type-id='type-id-446'/>
     </function-decl>
     <function-decl name='is_gnu_v3_mangled_dtor' mangled-name='is_gnu_v3_mangled_dtor' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='is_gnu_v3_mangled_dtor'>
       <parameter type-id='type-id-8' name='name' filepath='../.././libiberty/cp-demangle.c' line='5545' column='1'/>
-      <return type-id='type-id-448'/>
+      <return type-id='type-id-447'/>
     </function-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-443' size-in-bits='11136' id='type-id-461'>
+    <array-type-def dimensions='1' type-id='type-id-460' size-in-bits='11136' id='type-id-461'>
       <subrange length='58' type-id='type-id-22' id='type-id-462'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-461' const='yes' id='type-id-463'/>
-    <var-decl name='cplus_demangle_operators' type-id='type-id-463' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
+    <qualified-type-def type-id='type-id-442' const='yes' id='type-id-460'/>
+    <var-decl name='cplus_demangle_operators' type-id='type-id-461' mangled-name='cplus_demangle_operators' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='1576' column='1' elf-symbol-id='cplus_demangle_operators'/>
 
-    <array-type-def dimensions='1' type-id='type-id-450' size-in-bits='8448' id='type-id-464'>
+    <array-type-def dimensions='1' type-id='type-id-463' size-in-bits='8448' id='type-id-464'>
       <subrange length='33' type-id='type-id-22' id='type-id-465'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-464' const='yes' id='type-id-466'/>
-    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-466' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
+    <qualified-type-def type-id='type-id-449' const='yes' id='type-id-463'/>
+    <var-decl name='cplus_demangle_builtin_types' type-id='type-id-464' mangled-name='cplus_demangle_builtin_types' visibility='default' filepath='../.././libiberty/cp-demangle.c' line='2050' column='1' elf-symbol-id='cplus_demangle_builtin_types'/>
     <function-decl name='realloc' filepath='/usr/include/stdlib.h' line='485' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-2'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-458'>
+    <function-type size-in-bits='64' id='type-id-457'>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-5'/>
       <parameter type-id='type-id-2'/>
@@ -6537,62 +6536,62 @@
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/md5.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-467'>
+    <class-decl name='md5_ctx' size-in-bits='1248' is-struct='yes' visibility='default' filepath='../.././libiberty/../include/md5.h' line='85' column='1' id='type-id-466'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='A' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
+        <var-decl name='A' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='87' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='B' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
+        <var-decl name='B' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='88' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='C' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
+        <var-decl name='C' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='89' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='D' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
+        <var-decl name='D' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='total' type-id='type-id-469' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
+        <var-decl name='total' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='buflen' type-id='type-id-468' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
+        <var-decl name='buflen' type-id='type-id-467' visibility='default' filepath='../.././libiberty/../include/md5.h' line='93' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
         <var-decl name='buffer' type-id='type-id-87' visibility='default' filepath='../.././libiberty/../include/md5.h' line='94' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='uint32_t' type-id='type-id-35' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-470'/>
-    <typedef-decl name='md5_uint32' type-id='type-id-470' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-468'/>
+    <typedef-decl name='uint32_t' type-id='type-id-35' filepath='/usr/include/stdint.h' line='52' column='1' id='type-id-469'/>
+    <typedef-decl name='md5_uint32' type-id='type-id-469' filepath='../.././libiberty/../include/md5.h' line='46' column='1' id='type-id-467'/>
 
-    <array-type-def dimensions='1' type-id='type-id-468' size-in-bits='64' id='type-id-469'>
-      <subrange length='2' type-id='type-id-22' id='type-id-471'/>
+    <array-type-def dimensions='1' type-id='type-id-467' size-in-bits='64' id='type-id-468'>
+      <subrange length='2' type-id='type-id-22' id='type-id-470'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-467' size-in-bits='64' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-466' size-in-bits='64' id='type-id-471'/>
     <function-decl name='md5_init_ctx' mangled-name='md5_init_ctx' filepath='../.././libiberty/md5.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_init_ctx'>
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='65' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-467' const='yes' id='type-id-473'/>
-    <pointer-type-def type-id='type-id-473' size-in-bits='64' id='type-id-474'/>
+    <qualified-type-def type-id='type-id-466' const='yes' id='type-id-472'/>
+    <pointer-type-def type-id='type-id-472' size-in-bits='64' id='type-id-473'/>
     <function-decl name='md5_read_ctx' mangled-name='md5_read_ctx' filepath='../.././libiberty/md5.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_read_ctx'>
-      <parameter type-id='type-id-474' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
+      <parameter type-id='type-id-473' name='ctx' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <parameter type-id='type-id-2' name='resbuf' filepath='../.././libiberty/md5.c' line='82' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='md5_process_block' mangled-name='md5_process_block' filepath='../.././libiberty/md5.c' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_process_block'>
       <parameter type-id='type-id-2' name='buffer' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libiberty/md5.c' line='281' column='1'/>
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='281' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='md5_process_bytes' mangled-name='md5_process_bytes' filepath='../.././libiberty/md5.c' line='206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_process_bytes'>
       <parameter type-id='type-id-2' name='buffer' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <parameter type-id='type-id-5' name='len' filepath='../.././libiberty/md5.c' line='206' column='1'/>
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='206' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='md5_finish_ctx' mangled-name='md5_finish_ctx' filepath='../.././libiberty/md5.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='md5_finish_ctx'>
-      <parameter type-id='type-id-472' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
+      <parameter type-id='type-id-471' name='ctx' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <parameter type-id='type-id-2' name='resbuf' filepath='../.././libiberty/md5.c' line='102' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
@@ -6719,103 +6718,102 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hashtab.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='htab_size' mangled-name='htab_size' filepath='../.././libiberty/hashtab.c' line='224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_size'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-195'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='htab_create_alloc_ex' mangled-name='htab_create_alloc_ex' filepath='../.././libiberty/hashtab.c' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_alloc_ex'>
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='302' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
       <parameter type-id='type-id-2' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='303' column='1'/>
-      <parameter type-id='type-id-180' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
-      <parameter type-id='type-id-181' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
-      <return type-id='type-id-193'/>
+      <parameter type-id='type-id-182' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='304' column='1'/>
+      <parameter type-id='type-id-183' name='free_f' filepath='../.././libiberty/hashtab.c' line='305' column='1'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='htab_create_typed_alloc' mangled-name='htab_create_typed_alloc' filepath='../.././libiberty/hashtab.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_create_typed_alloc'>
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
-      <parameter type-id='type-id-178' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
-      <parameter type-id='type-id-178' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
-      <parameter type-id='type-id-179' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
-      <return type-id='type-id-193'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='356' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-180' name='alloc_tab_f' filepath='../.././libiberty/hashtab.c' line='357' column='1'/>
+      <parameter type-id='type-id-180' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <parameter type-id='type-id-181' name='free_f' filepath='../.././libiberty/hashtab.c' line='358' column='1'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='htab_set_functions_ex' mangled-name='htab_set_functions_ex' filepath='../.././libiberty/hashtab.c' line='390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_set_functions_ex'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='390' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
       <parameter type-id='type-id-2' name='alloc_arg' filepath='../.././libiberty/hashtab.c' line='391' column='1'/>
-      <parameter type-id='type-id-180' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
-      <parameter type-id='type-id-181' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-182' name='alloc_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
+      <parameter type-id='type-id-183' name='free_f' filepath='../.././libiberty/hashtab.c' line='392' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='htab_try_create' mangled-name='htab_try_create' filepath='../.././libiberty/hashtab.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_try_create'>
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
-      <parameter type-id='type-id-175' name='hash_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
-      <parameter type-id='type-id-176' name='eq_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
-      <parameter type-id='type-id-177' name='del_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
-      <return type-id='type-id-193'/>
+      <parameter type-id='type-id-177' name='hash_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
+      <parameter type-id='type-id-178' name='eq_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
+      <parameter type-id='type-id-179' name='del_f' filepath='../.././libiberty/hashtab.c' line='406' column='1'/>
+      <return type-id='type-id-195'/>
     </function-decl>
     <function-decl name='htab_empty' mangled-name='htab_empty' filepath='../.././libiberty/hashtab.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_empty'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='447' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='htab_find' mangled-name='htab_find' filepath='../.././libiberty/hashtab.c' line='628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='628' column='1'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='htab_find_slot' mangled-name='htab_find_slot' filepath='../.././libiberty/hashtab.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_find_slot'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
-      <parameter type-id='type-id-194' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
+      <parameter type-id='type-id-196' name='insert' filepath='../.././libiberty/hashtab.c' line='710' column='1'/>
       <return type-id='type-id-102'/>
     </function-decl>
     <function-decl name='htab_remove_elt_with_hash' mangled-name='htab_remove_elt_with_hash' filepath='../.././libiberty/hashtab.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt_with_hash'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
-      <parameter type-id='type-id-173' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
+      <parameter type-id='type-id-175' name='hash' filepath='../.././libiberty/hashtab.c' line='732' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='htab_remove_elt' mangled-name='htab_remove_elt' filepath='../.././libiberty/hashtab.c' line='721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_remove_elt'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <parameter type-id='type-id-2' name='element' filepath='../.././libiberty/hashtab.c' line='721' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='htab_clear_slot' mangled-name='htab_clear_slot' filepath='../.././libiberty/hashtab.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_clear_slot'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <parameter type-id='type-id-102' name='slot' filepath='../.././libiberty/hashtab.c' line='752' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='htab_traverse_noresize' mangled-name='htab_traverse_noresize' filepath='../.././libiberty/hashtab.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_traverse_noresize'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
-      <parameter type-id='type-id-405' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
+      <parameter type-id='type-id-404' name='callback' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <parameter type-id='type-id-2' name='info' filepath='../.././libiberty/hashtab.c' line='771' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <type-decl name='double' size-in-bits='64' id='type-id-475'/>
+    <type-decl name='double' size-in-bits='64' id='type-id-474'/>
     <function-decl name='htab_collisions' mangled-name='htab_collisions' filepath='../.././libiberty/hashtab.c' line='807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='htab_collisions'>
-      <parameter type-id='type-id-193' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
-      <return type-id='type-id-475'/>
+      <parameter type-id='type-id-195' name='htab' filepath='../.././libiberty/hashtab.c' line='807' column='1'/>
+      <return type-id='type-id-474'/>
     </function-decl>
     <function-decl name='iterative_hash' mangled-name='iterative_hash' filepath='../.././libiberty/hashtab.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterative_hash'>
       <parameter type-id='type-id-2' name='k_in' filepath='../.././libiberty/hashtab.c' line='931' column='1'/>
       <parameter type-id='type-id-5' name='length' filepath='../.././libiberty/hashtab.c' line='932' column='1'/>
-      <parameter type-id='type-id-173' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
-      <return type-id='type-id-173'/>
+      <parameter type-id='type-id-175' name='initval' filepath='../.././libiberty/hashtab.c' line='933' column='1'/>
+      <return type-id='type-id-175'/>
     </function-decl>
-    <var-decl name='htab_hash_pointer' type-id='type-id-175' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
-    <var-decl name='htab_eq_pointer' type-id='type-id-176' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
+    <var-decl name='htab_hash_pointer' type-id='type-id-177' mangled-name='htab_hash_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='82' column='1' elf-symbol-id='htab_hash_pointer'/>
+    <var-decl name='htab_eq_pointer' type-id='type-id-178' mangled-name='htab_eq_pointer' visibility='default' filepath='../.././libiberty/hashtab.c' line='83' column='1' elf-symbol-id='htab_eq_pointer'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/hex.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='hex_init' mangled-name='hex_init' filepath='../.././libiberty/hex.c' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hex_init'>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-419' const='yes' id='type-id-476'/>
-    <var-decl name='_hex_value' type-id='type-id-476' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
+    <var-decl name='_hex_value' type-id='type-id-418' mangled-name='_hex_value' visibility='default' filepath='../.././libiberty/hex.c' line='75' column='1' elf-symbol-id='_hex_value'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/lbasename.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='unix_lbasename' mangled-name='unix_lbasename' filepath='../.././libiberty/lbasename.c' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unix_lbasename'>
@@ -6864,13 +6862,13 @@
         <var-decl name='count' type-id='type-id-3' visibility='default' filepath='../.././libiberty/pex-common.h' line='71' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='children' type-id='type-id-477' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
+        <var-decl name='children' type-id='type-id-475' visibility='default' filepath='../.././libiberty/pex-common.h' line='73' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
         <var-decl name='status' type-id='type-id-62' visibility='default' filepath='../.././libiberty/pex-common.h' line='75' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='time' type-id='type-id-478' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
+        <var-decl name='time' type-id='type-id-476' visibility='default' filepath='../.././libiberty/pex-common.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
         <var-decl name='number_waited' type-id='type-id-3' visibility='default' filepath='../.././libiberty/pex-common.h' line='79' column='1'/>
@@ -6891,16 +6889,16 @@
         <var-decl name='remove' type-id='type-id-30' visibility='default' filepath='../.././libiberty/pex-common.h' line='90' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='funcs' type-id='type-id-479' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
+        <var-decl name='funcs' type-id='type-id-477' visibility='default' filepath='../.././libiberty/pex-common.h' line='92' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
         <var-decl name='sysdep' type-id='type-id-2' visibility='default' filepath='../.././libiberty/pex-common.h' line='94' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__pid_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-480'/>
-    <typedef-decl name='pid_t' type-id='type-id-480' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-481'/>
-    <pointer-type-def type-id='type-id-481' size-in-bits='64' id='type-id-477'/>
-    <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-482'>
+    <typedef-decl name='__pid_t' type-id='type-id-3' filepath='/usr/include/bits/types.h' line='143' column='1' id='type-id-478'/>
+    <typedef-decl name='pid_t' type-id='type-id-478' filepath='/usr/include/sys/types.h' line='99' column='1' id='type-id-479'/>
+    <pointer-type-def type-id='type-id-479' size-in-bits='64' id='type-id-475'/>
+    <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-480'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='user_seconds' type-id='type-id-4' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='561' column='1'/>
       </data-member>
@@ -6914,50 +6912,50 @@
         <var-decl name='system_microseconds' type-id='type-id-4' visibility='default' filepath='../.././libiberty/../include/libiberty.h' line='564' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-482' size-in-bits='64' id='type-id-478'/>
-    <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-483'>
+    <pointer-type-def type-id='type-id-480' size-in-bits='64' id='type-id-476'/>
+    <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-481'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='open_read' type-id='type-id-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='103' column='1'/>
+        <var-decl name='open_read' type-id='type-id-482' 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-484' visibility='default' filepath='../.././libiberty/pex-common.h' line='106' column='1'/>
+        <var-decl name='open_write' type-id='type-id-482' 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-485' visibility='default' filepath='../.././libiberty/pex-common.h' line='117' column='1'/>
+        <var-decl name='exec_child' type-id='type-id-483' 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-486' visibility='default' filepath='../.././libiberty/pex-common.h' line='124' column='1'/>
+        <var-decl name='close' type-id='type-id-484' 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-487' visibility='default' filepath='../.././libiberty/pex-common.h' line='129' column='1'/>
+        <var-decl name='wait' type-id='type-id-485' 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-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='135' column='1'/>
+        <var-decl name='pipe' type-id='type-id-486' 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-489' visibility='default' filepath='../.././libiberty/pex-common.h' line='139' column='1'/>
+        <var-decl name='fdopenr' type-id='type-id-487' 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-489' visibility='default' filepath='../.././libiberty/pex-common.h' line='144' column='1'/>
+        <var-decl name='fdopenw' type-id='type-id-487' 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-490' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
+        <var-decl name='cleanup' type-id='type-id-488' visibility='default' filepath='../.././libiberty/pex-common.h' line='147' column='1'/>
       </data-member>
     </class-decl>
+    <pointer-type-def type-id='type-id-489' size-in-bits='64' id='type-id-482'/>
+    <pointer-type-def type-id='type-id-490' size-in-bits='64' id='type-id-483'/>
     <pointer-type-def type-id='type-id-491' size-in-bits='64' id='type-id-484'/>
     <pointer-type-def type-id='type-id-492' size-in-bits='64' id='type-id-485'/>
     <pointer-type-def type-id='type-id-493' size-in-bits='64' id='type-id-486'/>
     <pointer-type-def type-id='type-id-494' size-in-bits='64' id='type-id-487'/>
     <pointer-type-def type-id='type-id-495' size-in-bits='64' id='type-id-488'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-489'/>
-    <pointer-type-def type-id='type-id-497' size-in-bits='64' id='type-id-490'/>
-    <qualified-type-def type-id='type-id-483' const='yes' id='type-id-498'/>
-    <pointer-type-def type-id='type-id-498' size-in-bits='64' id='type-id-479'/>
+    <qualified-type-def type-id='type-id-481' const='yes' id='type-id-496'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-477'/>
     <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-3' name='flags' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <parameter type-id='type-id-8' name='pname' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
       <parameter type-id='type-id-8' name='tempbase' filepath='../.././libiberty/pex-common.c' line='53' column='1'/>
-      <parameter type-id='type-id-479' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
+      <parameter type-id='type-id-477' name='funcs' filepath='../.././libiberty/pex-common.c' line='54' column='1'/>
       <return type-id='type-id-29'/>
     </function-decl>
     <function-decl name='pex_run_in_environment' mangled-name='pex_run_in_environment' filepath='../.././libiberty/pex-common.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_run_in_environment'>
@@ -6990,33 +6988,33 @@
     <function-decl name='pex_get_times' mangled-name='pex_get_times' filepath='../.././libiberty/pex-common.c' line='570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pex_get_times'>
       <parameter type-id='type-id-29' name='obj' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <parameter type-id='type-id-3' name='count' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
-      <parameter type-id='type-id-478' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
+      <parameter type-id='type-id-476' name='vector' filepath='../.././libiberty/pex-common.c' line='570' column='1'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-496'>
+    <function-type size-in-bits='64' id='type-id-494'>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-27'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-491'>
+    <function-type size-in-bits='64' id='type-id-489'>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-8'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-493'>
+    <function-type size-in-bits='64' id='type-id-491'>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-495'>
+    <function-type size-in-bits='64' id='type-id-493'>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-62'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-492'>
+    <function-type size-in-bits='64' id='type-id-490'>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-8'/>
@@ -7026,27 +7024,27 @@
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-272'/>
+      <parameter type-id='type-id-271'/>
       <parameter type-id='type-id-62'/>
-      <return type-id='type-id-481'/>
+      <return type-id='type-id-479'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-494'>
+    <function-type size-in-bits='64' id='type-id-492'>
       <parameter type-id='type-id-29'/>
-      <parameter type-id='type-id-481'/>
+      <parameter type-id='type-id-479'/>
       <parameter type-id='type-id-62'/>
-      <parameter type-id='type-id-478'/>
+      <parameter type-id='type-id-476'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-272'/>
+      <parameter type-id='type-id-271'/>
       <parameter type-id='type-id-62'/>
-      <return type-id='type-id-481'/>
+      <return type-id='type-id-479'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-497'>
+    <function-type size-in-bits='64' id='type-id-495'>
       <parameter type-id='type-id-29'/>
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/pex-unix.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
-    <var-decl name='funcs' type-id='type-id-498' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
+    <var-decl name='funcs' type-id='type-id-496' mangled-name='funcs' visibility='default' filepath='../.././libiberty/pex-unix.c' line='317' column='1' elf-symbol-id='funcs'/>
     <function-decl name='fcntl' filepath='/usr/include/fcntl.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-3'/>
@@ -7057,26 +7055,26 @@
       <parameter type-id='type-id-62'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-499'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='/usr/include/stdlib.h' line='68' column='1' id='type-id-497'>
       <data-member access='private'>
-        <var-decl name='__uptr' type-id='type-id-500' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
+        <var-decl name='__uptr' type-id='type-id-498' visibility='default' filepath='/usr/include/stdlib.h' line='70' column='1'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='__iptr' type-id='type-id-62' visibility='default' filepath='/usr/include/stdlib.h' line='71' column='1'/>
       </data-member>
     </union-decl>
-    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-501'>
+    <union-decl name='wait' size-in-bits='32' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='67' column='1' id='type-id-499'>
       <data-member access='private'>
         <var-decl name='w_status' type-id='type-id-3' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='69' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__wait_terminated' type-id='type-id-502' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
+        <var-decl name='__wait_terminated' type-id='type-id-500' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='84' column='1'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__wait_stopped' type-id='type-id-503' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
+        <var-decl name='__wait_stopped' type-id='type-id-501' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='97' column='1'/>
       </data-member>
     </union-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-502'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='70' column='1' id='type-id-500'>
       <data-member access='public' layout-offset-in-bits='25'>
         <var-decl name='__w_termsig' type-id='type-id-35' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='73' column='1'/>
       </data-member>
@@ -7087,7 +7085,7 @@
         <var-decl name='__w_retcode' type-id='type-id-35' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='75' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-503'>
+    <class-decl name='__anonymous_struct__' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='85' column='1' id='type-id-501'>
       <data-member access='public' layout-offset-in-bits='24'>
         <var-decl name='__w_stopval' type-id='type-id-35' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='88' column='1'/>
       </data-member>
@@ -7095,14 +7093,14 @@
         <var-decl name='__w_stopsig' type-id='type-id-35' visibility='default' filepath='/usr/include/bits/waitstatus.h' line='89' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-501' size-in-bits='64' id='type-id-500'/>
-    <typedef-decl name='__WAIT_STATUS' type-id='type-id-499' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-504'/>
-    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-505'>
+    <pointer-type-def type-id='type-id-499' size-in-bits='64' id='type-id-498'/>
+    <typedef-decl name='__WAIT_STATUS' type-id='type-id-497' filepath='/usr/include/stdlib.h' line='72' column='1' id='type-id-502'/>
+    <class-decl name='rusage' size-in-bits='1152' is-struct='yes' visibility='default' filepath='/usr/include/bits/resource.h' line='178' column='1' id='type-id-503'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ru_utime' type-id='type-id-506' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
+        <var-decl name='ru_utime' type-id='type-id-504' visibility='default' filepath='/usr/include/bits/resource.h' line='181' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='ru_stime' type-id='type-id-506' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
+        <var-decl name='ru_stime' type-id='type-id-504' visibility='default' filepath='/usr/include/bits/resource.h' line='183' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='ru_maxrss' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/resource.h' line='185' column='1'/>
@@ -7147,31 +7145,31 @@
         <var-decl name='ru_nivcsw' type-id='type-id-21' visibility='default' filepath='/usr/include/bits/resource.h' line='217' column='1'/>
       </data-member>
     </class-decl>
-    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-506'>
+    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-504'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-54' visibility='default' filepath='/usr/include/bits/time.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_usec' type-id='type-id-507' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
+        <var-decl name='tv_usec' type-id='type-id-505' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-507'/>
-    <pointer-type-def type-id='type-id-505' size-in-bits='64' id='type-id-508'/>
+    <typedef-decl name='__suseconds_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-505'/>
+    <pointer-type-def type-id='type-id-503' size-in-bits='64' id='type-id-506'/>
     <function-decl name='wait4' filepath='/usr/include/sys/wait.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-480'/>
-      <parameter type-id='type-id-504'/>
+      <parameter type-id='type-id-478'/>
+      <parameter type-id='type-id-502'/>
       <parameter type-id='type-id-3'/>
-      <parameter type-id='type-id-508'/>
-      <return type-id='type-id-480'/>
+      <parameter type-id='type-id-506'/>
+      <return type-id='type-id-478'/>
     </function-decl>
     <function-decl name='waitpid' filepath='/usr/include/sys/wait.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-478'/>
       <parameter type-id='type-id-62'/>
       <parameter type-id='type-id-3'/>
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-478'/>
     </function-decl>
     <function-decl name='kill' filepath='/usr/include/signal.h' line='126' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-480'/>
+      <parameter type-id='type-id-478'/>
       <parameter type-id='type-id-3'/>
       <return type-id='type-id-3'/>
     </function-decl>
@@ -7179,7 +7177,7 @@
       <parameter type-id='type-id-3'/>
       <parameter type-id='type-id-2'/>
       <parameter type-id='type-id-5'/>
-      <return type-id='type-id-391'/>
+      <return type-id='type-id-390'/>
     </function-decl>
     <function-decl name='_exit' filepath='/usr/include/unistd.h' line='600' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3' name='ch' filepath='../.././libiberty/cplus-dem.c' line='100' column='1'/>
@@ -7190,7 +7188,7 @@
       <return type-id='type-id-35'/>
     </function-decl>
     <function-decl name='vfork' filepath='/usr/include/unistd.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-480'/>
+      <return type-id='type-id-478'/>
     </function-decl>
     <function-decl name='dup2' filepath='/usr/include/unistd.h' line='531' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-3'/>
@@ -7210,14 +7208,14 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/safe-ctype.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
 
-    <array-type-def dimensions='1' type-id='type-id-14' size-in-bits='4096' id='type-id-509'>
-      <subrange length='256' type-id='type-id-22' id='type-id-400'/>
+    <array-type-def dimensions='1' type-id='type-id-507' size-in-bits='4096' id='type-id-508'>
+      <subrange length='256' type-id='type-id-22' id='type-id-399'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-509' const='yes' id='type-id-510'/>
-    <var-decl name='_sch_istable' type-id='type-id-510' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
-    <var-decl name='_sch_toupper' type-id='type-id-476' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
-    <var-decl name='_sch_tolower' type-id='type-id-476' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
+    <qualified-type-def type-id='type-id-14' const='yes' id='type-id-507'/>
+    <var-decl name='_sch_istable' type-id='type-id-508' mangled-name='_sch_istable' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='159' column='1' elf-symbol-id='_sch_istable'/>
+    <var-decl name='_sch_toupper' type-id='type-id-418' mangled-name='_sch_toupper' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='220' column='1' elf-symbol-id='_sch_toupper'/>
+    <var-decl name='_sch_tolower' type-id='type-id-418' mangled-name='_sch_tolower' visibility='default' filepath='../.././libiberty/safe-ctype.c' line='191' column='1' elf-symbol-id='_sch_tolower'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../.././libiberty/unlink-if-ordinary.c' comp-dir-path='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/host-x86_64-unknown-linux-gnu/libiberty' language='LANG_C89'>
     <function-decl name='__lxstat' filepath='/usr/include/sys/stat.h' line='405' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -7235,10 +7233,10 @@
       <parameter type-id='type-id-5' name='size' filepath='../.././libiberty/xmalloc.c' line='117' column='1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-511'/>
-    <typedef-decl name='intptr_t' type-id='type-id-511' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-512'/>
+    <typedef-decl name='__intptr_t' type-id='type-id-21' filepath='/usr/include/bits/types.h' line='189' column='1' id='type-id-509'/>
+    <typedef-decl name='intptr_t' type-id='type-id-509' filepath='/usr/include/unistd.h' line='268' column='1' id='type-id-510'/>
     <function-decl name='sbrk' filepath='/usr/include/unistd.h' line='1053' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-512'/>
+      <parameter type-id='type-id-510'/>
       <return type-id='type-id-2'/>
     </function-decl>
     <function-decl name='calloc' filepath='/usr/include/stdlib.h' line='473' column='1' visibility='default' binding='global' size-in-bits='64'>

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 6aefe80..25b2a0e 100644 (file)
--- 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
@@ -12958,8 +12958,9 @@
     <qualified-type-def type-id='type-id-36' const='yes' id='type-id-496'/>
     <type-decl name='short int' size-in-bits='16' id='type-id-594'/>
     <qualified-type-def type-id='type-id-594' const='yes' id='type-id-500'/>
+    <qualified-type-def type-id='type-id-15' const='yes' id='type-id-595'/>
     <array-type-def dimensions='1' type-id='type-id-80' size-in-bits='1024' id='type-id-95'>
-      <subrange length='8' type-id='type-id-515' id='type-id-595'/>
+      <subrange length='8' type-id='type-id-515' id='type-id-596'/>
 
     </array-type-def>
     <reference-type-def kind='lvalue' type-id='type-id-160' size-in-bits='64' id='type-id-452'/>
@@ -12971,81 +12972,81 @@
     <reference-type-def kind='lvalue' type-id='type-id-229' size-in-bits='64' id='type-id-483'/>
     <pointer-type-def type-id='type-id-229' size-in-bits='64' id='type-id-480'/>
     <reference-type-def kind='lvalue' type-id='type-id-23' size-in-bits='64' id='type-id-310'/>
-    <reference-type-def kind='lvalue' type-id='type-id-596' size-in-bits='64' id='type-id-450'/>
+    <reference-type-def kind='lvalue' type-id='type-id-597' size-in-bits='64' id='type-id-450'/>
     <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-382'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_cfile' type-id='type-id-597' 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-598' 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-23' 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-598' is-artificial='yes'/>
-            <parameter type-id='type-id-599'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
+            <parameter type-id='type-id-600'/>
             <return type-id='type-id-4'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='66' 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-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-598'/>
+            <return type-id='type-id-599'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='69' 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-598' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
+            <parameter type-id='type-id-598'/>
             <parameter type-id='type-id-51'/>
-            <return type-id='type-id-598'/>
+            <return type-id='type-id-599'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='72' 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-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-51'/>
-            <return type-id='type-id-598'/>
+            <return type-id='type-id-599'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
-            <return type-id='type-id-598'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
+            <return type-id='type-id-599'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='78' 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-600' is-artificial='yes'/>
+            <parameter type-id='type-id-601' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <return type-id='type-id-36'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='84' 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-598' is-artificial='yes'/>
-            <return type-id='type-id-597'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
+            <return type-id='type-id-598'/>
           </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-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsputnEPKcl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-48'/>
@@ -13053,7 +13054,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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='92' 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-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-48'/>
             <parameter type-id='type-id-11'/>
@@ -13063,7 +13064,7 @@
         </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE6xsgetnEPcl@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-48'/>
             <return type-id='type-id-48'/>
@@ -13071,7 +13072,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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='99' 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-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
             <parameter type-id='type-id-50'/>
             <return type-id='type-id-60'/>
@@ -13079,26 +13080,26 @@
         </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <return type-id='type-id-36'/>
           </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/include/x86_64-unknown-linux-gnu/bits/basic_file.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12__basic_fileIcE9showmanycEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <return type-id='type-id-48'/>
           </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-598' is-artificial='yes'/>
-            <parameter type-id='type-id-599'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
+            <parameter type-id='type-id-600'/>
             <return type-id='type-id-4'/>
           </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-598' is-artificial='yes'/>
+            <parameter type-id='type-id-599' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -13107,134 +13108,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-386'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-601'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-602'/>
         <member-type access='private'>
-          <typedef-decl name='intern_type' type-id='type-id-15' 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-602'/>
+          <typedef-decl name='intern_type' type-id='type-id-15' 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-603'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='extern_type' type-id='type-id-15' 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-603'/>
+          <typedef-decl name='extern_type' type-id='type-id-15' 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-604'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='state_type' type-id='type-id-62' 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-604'/>
+          <typedef-decl name='state_type' type-id='type-id-62' 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-605'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_codecvt' type-id='type-id-605' 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-606' 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-606' 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-607' 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-607' is-artificial='yes'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-607' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-607' is-artificial='yes'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-607' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-607' is-artificial='yes'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-607' is-artificial='yes'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-607' is-artificial='yes'/>
+            <parameter type-id='type-id-608' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-608' is-artificial='yes'/>
-            <parameter type-id='type-id-609'/>
-            <parameter type-id='type-id-610'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
             <parameter type-id='type-id-610'/>
             <parameter type-id='type-id-611'/>
-            <parameter type-id='type-id-612'/>
+            <parameter type-id='type-id-611'/>
             <parameter type-id='type-id-612'/>
             <parameter type-id='type-id-613'/>
-            <return type-id='type-id-614'/>
+            <parameter type-id='type-id-613'/>
+            <parameter type-id='type-id-614'/>
+            <return type-id='type-id-615'/>
           </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-608' is-artificial='yes'/>
-            <parameter type-id='type-id-609'/>
-            <parameter type-id='type-id-612'/>
-            <parameter type-id='type-id-612'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
+            <parameter type-id='type-id-610'/>
             <parameter type-id='type-id-613'/>
-            <return type-id='type-id-614'/>
+            <parameter type-id='type-id-613'/>
+            <parameter type-id='type-id-614'/>
+            <return type-id='type-id-615'/>
           </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-608' is-artificial='yes'/>
-            <parameter type-id='type-id-609'/>
-            <parameter type-id='type-id-615'/>
-            <parameter type-id='type-id-615'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
+            <parameter type-id='type-id-610'/>
+            <parameter type-id='type-id-616'/>
             <parameter type-id='type-id-616'/>
             <parameter type-id='type-id-617'/>
-            <parameter type-id='type-id-617'/>
             <parameter type-id='type-id-618'/>
-            <return type-id='type-id-614'/>
+            <parameter type-id='type-id-618'/>
+            <parameter type-id='type-id-619'/>
+            <return type-id='type-id-615'/>
           </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-608' is-artificial='yes'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
             <return type-id='type-id-36'/>
           </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-608' is-artificial='yes'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </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-608' is-artificial='yes'/>
-            <parameter type-id='type-id-609'/>
-            <parameter type-id='type-id-615'/>
-            <parameter type-id='type-id-615'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
+            <parameter type-id='type-id-610'/>
+            <parameter type-id='type-id-616'/>
+            <parameter type-id='type-id-616'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-36'/>
           </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-608' is-artificial='yes'/>
+            <parameter type-id='type-id-609' is-artificial='yes'/>
             <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
@@ -13242,160 +13243,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-411'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-619'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-620'/>
         <member-type access='private'>
-          <typedef-decl name='intern_type' type-id='type-id-105' 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-620'/>
+          <typedef-decl name='intern_type' type-id='type-id-105' 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-621'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='extern_type' type-id='type-id-15' 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-621'/>
+          <typedef-decl name='extern_type' type-id='type-id-15' 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-622'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='state_type' type-id='type-id-62' 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-622'/>
+          <typedef-decl name='state_type' type-id='type-id-62' 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-623'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_codecvt' type-id='type-id-605' 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-606' 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-606' 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-607' 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-623' is-artificial='yes'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-623' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-623' is-artificial='yes'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-623' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-623' is-artificial='yes'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-623' is-artificial='yes'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-623' is-artificial='yes'/>
+            <parameter type-id='type-id-624' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE6do_outERS0_PKwS4_RS4_PcS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-624' is-artificial='yes'/>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-626'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
             <parameter type-id='type-id-626'/>
             <parameter type-id='type-id-627'/>
+            <parameter type-id='type-id-627'/>
             <parameter type-id='type-id-628'/>
-            <parameter type-id='type-id-628'/>
             <parameter type-id='type-id-629'/>
-            <return type-id='type-id-630'/>
+            <parameter type-id='type-id-629'/>
+            <parameter type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </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-624' is-artificial='yes'/>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-626'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
             <parameter type-id='type-id-626'/>
             <parameter type-id='type-id-627'/>
+            <parameter type-id='type-id-627'/>
             <parameter type-id='type-id-628'/>
-            <parameter type-id='type-id-628'/>
             <parameter type-id='type-id-629'/>
-            <return type-id='type-id-614'/>
+            <parameter type-id='type-id-629'/>
+            <parameter type-id='type-id-630'/>
+            <return type-id='type-id-615'/>
           </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-624' is-artificial='yes'/>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-628'/>
-            <parameter type-id='type-id-628'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
+            <parameter type-id='type-id-626'/>
+            <parameter type-id='type-id-629'/>
             <parameter type-id='type-id-629'/>
-            <return type-id='type-id-614'/>
+            <parameter type-id='type-id-630'/>
+            <return type-id='type-id-615'/>
           </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' elf-symbol-id='_ZNKSt7codecvtIwc11__mbstate_tE5do_inERS0_PKcS4_RS4_PwS6_RS6_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-624' is-artificial='yes'/>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-631'/>
-            <parameter type-id='type-id-631'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
+            <parameter type-id='type-id-626'/>
+            <parameter type-id='type-id-632'/>
             <parameter type-id='type-id-632'/>
-            <parameter type-id='type-id-633'/>
             <parameter type-id='type-id-633'/>
             <parameter type-id='type-id-634'/>
-            <return type-id='type-id-630'/>
+            <parameter type-id='type-id-634'/>
+            <parameter type-id='type-id-635'/>
+            <return type-id='type-id-631'/>
           </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-624' is-artificial='yes'/>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-631'/>
-            <parameter type-id='type-id-631'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
+            <parameter type-id='type-id-626'/>
+            <parameter type-id='type-id-632'/>
             <parameter type-id='type-id-632'/>
             <parameter type-id='type-id-633'/>
-            <parameter type-id='type-id-633'/>
             <parameter type-id='type-id-634'/>
-            <return type-id='type-id-614'/>
+            <parameter type-id='type-id-634'/>
+            <parameter type-id='type-id-635'/>
+            <return type-id='type-id-615'/>
           </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-624' is-artificial='yes'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
             <return type-id='type-id-36'/>
           </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-624' is-artificial='yes'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </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-624' is-artificial='yes'/>
-            <parameter type-id='type-id-625'/>
-            <parameter type-id='type-id-631'/>
-            <parameter type-id='type-id-631'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
+            <parameter type-id='type-id-626'/>
+            <parameter type-id='type-id-632'/>
+            <parameter type-id='type-id-632'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-36'/>
           </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-624' is-artificial='yes'/>
+            <parameter type-id='type-id-625' is-artificial='yes'/>
             <return type-id='type-id-36'/>
           </function-decl>
         </member-function>
@@ -13403,48 +13404,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-17'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-637'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-637'/>
+          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-638'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_ctype' type-id='type-id-605' visibility='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-606' visibility='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-23' visibility='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-638' visibility='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-639' visibility='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-638' visibility='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-639' visibility='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-639' visibility='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-640' visibility='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-15' visibility='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-640' visibility='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-641' visibility='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-640' visibility='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-641' visibility='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-15' visibility='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-606' 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-607' 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-641' 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-642' 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-642' is-artificial='yes'/>
-            <parameter type-id='type-id-639'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-640'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -13452,9 +13453,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-642' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
-            <parameter type-id='type-id-639'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
+            <parameter type-id='type-id-640'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -13462,25 +13463,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is' mangled-name='_ZNKSt5ctypeIcE2isEtc' 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_inline.h' line='42' 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'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is' mangled-name='_ZNKSt5ctypeIcE2isEPKcS2_Pt' 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_inline.h' line='47' 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-11'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='scan_is' mangled-name='_ZNKSt5ctypeIcE7scan_isEtPKcS2_' 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_inline.h' line='56' 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'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-11'/>
@@ -13488,8 +13489,8 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='scan_not' mangled-name='_ZNKSt5ctypeIcE8scan_notEtPKcS2_' 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_inline.h' line='66' 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'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-11'/>
@@ -13497,96 +13498,96 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='toupper' mangled-name='_ZNKSt5ctypeIcE7toupperEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='797' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
-            <return type-id='type-id-637'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
+            <return type-id='type-id-638'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='toupper' mangled-name='_ZNKSt5ctypeIcE7toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='814' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-647'/>
-            <return type-id='type-id-647'/>
+            <parameter type-id='type-id-648'/>
+            <return type-id='type-id-648'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='tolower' mangled-name='_ZNKSt5ctypeIcE7tolowerEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='830' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
-            <return type-id='type-id-637'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
+            <return type-id='type-id-638'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='tolower' mangled-name='_ZNKSt5ctypeIcE7tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='847' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-647'/>
-            <return type-id='type-id-647'/>
+            <parameter type-id='type-id-648'/>
+            <return type-id='type-id-648'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='widen' mangled-name='_ZNKSt5ctypeIcE5widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='867' 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-15'/>
-            <return type-id='type-id-637'/>
+            <return type-id='type-id-638'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='widen' mangled-name='_ZNKSt5ctypeIcE5widenEPKcS2_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='894' 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-11'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-647'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='narrow' mangled-name='_ZNKSt5ctypeIcE6narrowEcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='925' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='narrow' mangled-name='_ZNKSt5ctypeIcE6narrowEPKcS2_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='958' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-647'/>
-            <parameter type-id='type-id-647'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-648'/>
+            <parameter type-id='type-id-648'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-647'/>
+            <return type-id='type-id-648'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='table' mangled-name='_ZNKSt5ctypeIcE5tableEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='976' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <return type-id='type-id-639'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <return type-id='type-id-640'/>
           </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/include/bits/locale_facets.h' line='981' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt5ctypeIcE13classic_tableEv@@GLIBCXX_3.4'>
-            <return type-id='type-id-639'/>
+            <return type-id='type-id-640'/>
           </function-decl>
         </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-642' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
-            <parameter type-id='type-id-639'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
+            <parameter type-id='type-id-640'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -13594,8 +13595,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-642' is-artificial='yes'/>
-            <parameter type-id='type-id-639'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
+            <parameter type-id='type-id-640'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -13603,50 +13604,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-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-642' is-artificial='yes'/>
+            <parameter type-id='type-id-643' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
-            <return type-id='type-id-637'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
+            <return type-id='type-id-638'/>
           </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIcE10do_toupperEPcPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-647'/>
-            <return type-id='type-id-647'/>
+            <parameter type-id='type-id-648'/>
+            <return type-id='type-id-648'/>
           </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-11'/>
@@ -13654,29 +13655,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' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
-            <return type-id='type-id-637'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
+            <return type-id='type-id-638'/>
           </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIcE10do_tolowerEPcPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-643' is-artificial='yes'/>
-            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-647'/>
-            <return type-id='type-id-647'/>
+            <parameter type-id='type-id-648'/>
+            <return type-id='type-id-648'/>
           </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-11'/>
@@ -13684,181 +13685,181 @@
         </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-637'/>
+            <return type-id='type-id-638'/>
           </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-643' is-artificial='yes'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-646'/>
+            <parameter type-id='type-id-647'/>
             <return type-id='type-id-11'/>
           </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-643' is-artificial='yes'/>
-            <parameter type-id='type-id-637'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-638'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </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-643' is-artificial='yes'/>
-            <parameter type-id='type-id-647'/>
-            <parameter type-id='type-id-647'/>
+            <parameter type-id='type-id-644' is-artificial='yes'/>
+            <parameter type-id='type-id-648'/>
+            <parameter type-id='type-id-648'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-647'/>
+            <return type-id='type-id-648'/>
           </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-107'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-648'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-649'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-649'/>
+          <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-650'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__wmask_type' type-id='type-id-544' filepath='/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-650'/>
+          <typedef-decl name='__wmask_type' type-id='type-id-544' filepath='/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-651'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='128'>
-          <var-decl name='_M_c_locale_ctype' type-id='type-id-605' visibility='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-606' visibility='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-23' visibility='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-651' visibility='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-652' visibility='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-652' visibility='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-653' visibility='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-653' visibility='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-654' visibility='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-654' visibility='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-655' visibility='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-606' 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-607' 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-655' is-artificial='yes'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-655' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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/include/bits/locale_facets.h' line='1225' 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-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <return type-id='type-id-650'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <return type-id='type-id-651'/>
           </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/include/bits/locale_facets.h' line='1463' 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-655' is-artificial='yes'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-655' is-artificial='yes'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-655' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-655' is-artificial='yes'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-655' is-artificial='yes'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-655' is-artificial='yes'/>
+            <parameter type-id='type-id-656' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE5do_isEtw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-649'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-650'/>
             <return type-id='type-id-23'/>
           </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-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-105'/>
             <return type-id='type-id-23'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE5do_isEPKwS2_Pt@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-645'/>
-            <return type-id='type-id-657'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-646'/>
+            <return type-id='type-id-658'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-249'/>
             <parameter type-id='type-id-249'/>
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-249'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE10do_scan_isEtPKwS2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-657'/>
-            <return type-id='type-id-657'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-658'/>
+            <return type-id='type-id-658'/>
           </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-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-249'/>
             <parameter type-id='type-id-249'/>
             <return type-id='type-id-249'/>
@@ -13866,47 +13867,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' elf-symbol-id='_ZNKSt5ctypeIwE11do_scan_notEtPKwS2_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-657'/>
-            <return type-id='type-id-657'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-658'/>
+            <return type-id='type-id-658'/>
           </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-656' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-657'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-658'/>
             <return type-id='type-id-249'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE10do_toupperEw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-649'/>
-            <return type-id='type-id-649'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-650'/>
+            <return type-id='type-id-650'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-105'/>
             <return type-id='type-id-105'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE10do_toupperEPwPKw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-659'/>
             <parameter type-id='type-id-658'/>
-            <parameter type-id='type-id-657'/>
-            <return type-id='type-id-657'/>
+            <return type-id='type-id-658'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-219'/>
             <parameter type-id='type-id-249'/>
             <return type-id='type-id-249'/>
@@ -13914,29 +13915,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' elf-symbol-id='_ZNKSt5ctypeIwE10do_tolowerEw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-649'/>
-            <return type-id='type-id-649'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-650'/>
+            <return type-id='type-id-650'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-105'/>
             <return type-id='type-id-105'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE10do_tolowerEPwPKw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-659'/>
             <parameter type-id='type-id-658'/>
-            <parameter type-id='type-id-657'/>
-            <return type-id='type-id-657'/>
+            <return type-id='type-id-658'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-219'/>
             <parameter type-id='type-id-249'/>
             <return type-id='type-id-249'/>
@@ -13944,30 +13945,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' elf-symbol-id='_ZNKSt5ctypeIwE8do_widenEc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-649'/>
+            <return type-id='type-id-650'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-105'/>
           </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' elf-symbol-id='_ZNKSt5ctypeIwE8do_widenEPKcS2_Pw@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-659'/>
             <return type-id='type-id-11'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-219'/>
@@ -13976,15 +13977,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' elf-symbol-id='_ZNKSt5ctypeIwE9do_narrowEwc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-649'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-650'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
@@ -13992,17 +13993,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' elf-symbol-id='_ZNKSt5ctypeIwE9do_narrowEPKwS2_cPc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-656' is-artificial='yes'/>
-            <parameter type-id='type-id-657'/>
-            <parameter type-id='type-id-657'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
+            <parameter type-id='type-id-658'/>
+            <parameter type-id='type-id-658'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-657'/>
+            <return type-id='type-id-658'/>
           </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-656' is-artificial='yes'/>
+            <parameter type-id='type-id-657' is-artificial='yes'/>
             <parameter type-id='type-id-249'/>
             <parameter type-id='type-id-249'/>
             <parameter type-id='type-id-15'/>
@@ -14016,34 +14017,34 @@
       <class-decl name='exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='62' column='1' is-declaration-only='yes' id='type-id-86'>
         <member-function access='private' constructor='yes'>
           <function-decl name='exception' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' mangled-name='_ZNSt9exceptionD0Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' mangled-name='_ZNSt9exceptionD2Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt9exception4whatEv' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9exception4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -14052,50 +14053,50 @@
     <namespace-decl name='std'>
       <class-decl name='initializer_list&lt;char&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-183'>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-661'/>
+          <typedef-decl name='iterator' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-662'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-66' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-662'/>
+          <typedef-decl name='size_type' type-id='type-id-66' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-663'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-663'/>
+          <typedef-decl name='const_iterator' type-id='type-id-11' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-664'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-661' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='58' column='1'/>
+          <var-decl name='_M_array' type-id='type-id-662' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/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-662' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-663' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
+            <parameter type-id='type-id-664'/>
             <parameter type-id='type-id-663'/>
-            <parameter type-id='type-id-662'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-664' is-artificial='yes'/>
+            <parameter type-id='type-id-665' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt16initializer_listIcE4sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-665' is-artificial='yes'/>
-            <return type-id='type-id-662'/>
+            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <return type-id='type-id-663'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='begin' mangled-name='_ZNKSt16initializer_listIcE5beginEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-665' is-artificial='yes'/>
-            <return type-id='type-id-663'/>
+            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <return type-id='type-id-664'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='end' mangled-name='_ZNKSt16initializer_listIcE3endEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-665' is-artificial='yes'/>
-            <return type-id='type-id-663'/>
+            <parameter type-id='type-id-666' is-artificial='yes'/>
+            <return type-id='type-id-664'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14103,50 +14104,50 @@
     <namespace-decl name='std'>
       <class-decl name='initializer_list&lt;wchar_t&gt;' size-in-bits='128' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='47' column='1' id='type-id-252'>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-249' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-666'/>
+          <typedef-decl name='iterator' type-id='type-id-249' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='54' column='1' id='type-id-667'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-66' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-667'/>
+          <typedef-decl name='size_type' type-id='type-id-66' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='53' column='1' id='type-id-668'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-249' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-668'/>
+          <typedef-decl name='const_iterator' type-id='type-id-249' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='55' column='1' id='type-id-669'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_array' type-id='type-id-666' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='58' column='1'/>
+          <var-decl name='_M_array' type-id='type-id-667' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/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-667' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
+          <var-decl name='_M_len' type-id='type-id-668' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='59' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='62' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <parameter type-id='type-id-670' is-artificial='yes'/>
+            <parameter type-id='type-id-669'/>
             <parameter type-id='type-id-668'/>
-            <parameter type-id='type-id-667'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='initializer_list' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='66' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-669' is-artificial='yes'/>
+            <parameter type-id='type-id-670' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt16initializer_listIwE4sizeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
-            <return type-id='type-id-667'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
+            <return type-id='type-id-668'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='begin' mangled-name='_ZNKSt16initializer_listIwE5beginEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
-            <return type-id='type-id-668'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
+            <return type-id='type-id-669'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='end' mangled-name='_ZNKSt16initializer_listIwE3endEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/initializer_list' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-670' is-artificial='yes'/>
-            <return type-id='type-id-668'/>
+            <parameter type-id='type-id-671' is-artificial='yes'/>
+            <return type-id='type-id-669'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -14154,48 +14155,48 @@
     <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-32'>
         <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-635'>
+          <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-636'>
             <data-member access='private' layout-offset-in-bits='64'>
               <var-decl name='_M_refcount' type-id='type-id-78' 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-605' 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-606' 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-671' 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-672' 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-672' mangled-name='_ZNSt6locale5facet7_S_onceE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++98/locale.cc' line='196' column='1'/>
+              <var-decl name='_S_once' type-id='type-id-673' 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-673' is-artificial='yes'/>
+                <parameter type-id='type-id-674' is-artificial='yes'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
               </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/include/bits/locale_classes.h' line='387' 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-674'/>
+                <parameter type-id='type-id-675'/>
                 <return type-id='type-id-4'/>
               </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='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='395' 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-605'/>
+                <return type-id='type-id-606'/>
               </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/include/bits/locale_classes.h' line='384' 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-674'/>
-                <return type-id='type-id-605'/>
+                <parameter type-id='type-id-675'/>
+                <return type-id='type-id-606'/>
               </function-decl>
             </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/include/bits/locale_classes.h' line='380' 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-674'/>
+                <parameter type-id='type-id-675'/>
                 <parameter type-id='type-id-11'/>
-                <parameter type-id='type-id-605'/>
+                <parameter type-id='type-id-606'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
@@ -14206,9 +14207,9 @@
             </member-function>
             <member-function access='protected' static='yes'>
               <function-decl name='_S_lc_ctype_c_locale' mangled-name='_ZNSt6locale5facet20_S_lc_ctype_c_localeEP15__locale_structPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-605'/>
+                <parameter type-id='type-id-606'/>
                 <parameter type-id='type-id-11'/>
-                <return type-id='type-id-605'/>
+                <return type-id='type-id-606'/>
               </function-decl>
             </member-function>
             <member-function access='protected' static='yes'>
@@ -14218,47 +14219,47 @@
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='_M_add_reference' mangled-name='_ZNKSt6locale5facet16_M_add_referenceEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='402' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-675' is-artificial='yes'/>
+                <parameter type-id='type-id-676' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='_M_remove_reference' mangled-name='_ZNKSt6locale5facet19_M_remove_referenceEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='406' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-675' is-artificial='yes'/>
+                <parameter type-id='type-id-676' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </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-673' is-artificial='yes'/>
-                <parameter type-id='type-id-676'/>
+                <parameter type-id='type-id-674' is-artificial='yes'/>
+                <parameter type-id='type-id-677'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='operator=' mangled-name='_ZNSt6locale5facetaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='423' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-673' is-artificial='yes'/>
-                <parameter type-id='type-id-676'/>
-                <return type-id='type-id-677'/>
+                <parameter type-id='type-id-674' is-artificial='yes'/>
+                <parameter type-id='type-id-677'/>
+                <return type-id='type-id-678'/>
               </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-673' is-artificial='yes'/>
+                <parameter type-id='type-id-674' is-artificial='yes'/>
                 <parameter type-id='type-id-36' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </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-673' is-artificial='yes'/>
+                <parameter type-id='type-id-674' is-artificial='yes'/>
                 <parameter type-id='type-id-36' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </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-673' is-artificial='yes'/>
+                <parameter type-id='type-id-674' is-artificial='yes'/>
                 <parameter type-id='type-id-36' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
@@ -14266,7 +14267,7 @@
           </class-decl>
         </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-606'>
+          <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-607'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_M_index' type-id='type-id-66' 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>
@@ -14275,96 +14276,96 @@
             </data-member>
             <member-function access='private'>
               <function-decl name='operator=' mangled-name='_ZNSt6locale2idaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='461' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-678' is-artificial='yes'/>
-                <parameter type-id='type-id-679'/>
+                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680'/>
                 <return type-id='type-id-4'/>
               </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='463' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-678' is-artificial='yes'/>
-                <parameter type-id='type-id-679'/>
+                <parameter type-id='type-id-679' is-artificial='yes'/>
+                <parameter type-id='type-id-680'/>
                 <return type-id='type-id-4'/>
               </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-678' is-artificial='yes'/>
+                <parameter type-id='type-id-679' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private' const='yes'>
               <function-decl name='_M_id' mangled-name='_ZNKSt6locale2id5_M_idEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale2id5_M_idEv@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-680' is-artificial='yes'/>
+                <parameter type-id='type-id-681' is-artificial='yes'/>
                 <return type-id='type-id-66'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='category' type-id='type-id-36' filepath='/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-681'/>
+          <typedef-decl name='category' type-id='type-id-36' filepath='/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-682'/>
         </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-682'>
+          <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-683'>
             <data-member access='private' layout-offset-in-bits='0'>
               <var-decl name='_M_refcount' type-id='type-id-78' 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-683' 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-684' 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-66' 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-683' 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-684' 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-684' 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'/>
+              <var-decl name='_M_names' type-id='type-id-685' 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-685' 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-686' 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-685' 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-686' 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-685' 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-686' 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-685' 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-686' 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-685' 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-686' 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-685' 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-686' 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-686' 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-687' 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'>
               <function-decl name='_M_add_reference' mangled-name='_ZNSt6locale5_Impl16_M_add_referenceEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='511' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_remove_reference' mangled-name='_ZNSt6locale5_Impl19_M_remove_referenceEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='515' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </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='529' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-687' is-artificial='yes'/>
-                <parameter type-id='type-id-688'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-689'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-11'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
@@ -14372,299 +14373,299 @@
             </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-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-36' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-688'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-689'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='operator=' mangled-name='_ZNSt6locale5_ImplaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-687' is-artificial='yes'/>
-                <parameter type-id='type-id-688'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-689'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_check_same_name' mangled-name='_ZNSt6locale5_Impl18_M_check_same_nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='541' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <return type-id='type-id-23'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_categories' mangled-name='_ZNSt6locale5_Impl21_M_replace_categoriesEPKS0_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='552' 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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-689'/>
-                <parameter type-id='type-id-681'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-690'/>
+                <parameter type-id='type-id-682'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_category' mangled-name='_ZNSt6locale5_Impl19_M_replace_categoryEPKS0_PKPKNS_2idE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='555' 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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-689'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-690'/>
+                <parameter type-id='type-id-691'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_replace_facet' mangled-name='_ZNSt6locale5_Impl16_M_replace_facetEPKS0_PKNS_2idE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='558' 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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-689'/>
-                <parameter type-id='type-id-680'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-690'/>
+                <parameter type-id='type-id-681'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_install_facet' mangled-name='_ZNSt6locale5_Impl16_M_install_facetEPKNS_2idEPKNS_5facetE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='561' 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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-680'/>
-                <parameter type-id='type-id-675'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-681'/>
+                <parameter type-id='type-id-676'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_install_cache' mangled-name='_ZNSt6locale5_Impl16_M_install_cacheEPKNS_5facetEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='569' 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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-675'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-676'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-36' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-688'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-689'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-642'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-643'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-607'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-608'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-691'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-692'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-692'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-693'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-693'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-694'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-694'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-695'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-695'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-696'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-696'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-697'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-697'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-698'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-698'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-699'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-699'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-700'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-700'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-701'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-701'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-702'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-702'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-703'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-655'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-656'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-623'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-624'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-703'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-704'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-704'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-705'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-705'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-706'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-706'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-707'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-707'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-708'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-708'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-709'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-709'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-710'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-710'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-711'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-711'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-712'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-712'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-713'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-713'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-714'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
-                <parameter type-id='type-id-714'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
+                <parameter type-id='type-id-715'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
               </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-687' is-artificial='yes'/>
+                <parameter type-id='type-id-688' is-artificial='yes'/>
                 <parameter type-id='type-id-11'/>
                 <parameter type-id='type-id-66'/>
                 <return type-id='type-id-4'/>
@@ -14673,124 +14674,124 @@
           </class-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_classes.h' line='306' column='1' id='type-id-715'>
+          <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-716'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='_S_categories_size' value='12'/>
           </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_classes.h' line='306' column='1' id='type-id-715'>
+          <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-716'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='_S_categories_size' value='12'/>
           </enum-decl>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='none' type-id='type-id-716' 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-717' 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-716' 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-717' 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-716' 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-717' 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-716' 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-717' 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-716' 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-717' 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-716' 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-717' 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-716' 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-717' 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-716' 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-717' 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-687' 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-688' 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-687' 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-688' 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-687' 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-688' 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-717' 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-718' 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-672' 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'/>
+          <var-decl name='_S_once' type-id='type-id-673' 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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-681'/>
+            <parameter type-id='type-id-682'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-681'/>
+            <parameter type-id='type-id-682'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt6localeaSERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt6localeaSERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <return type-id='type-id-31'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='name' mangled-name='_ZNKSt6locale4nameEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6locale4nameEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <return type-id='type-id-87'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt6localeeqERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt6localeeqERKS_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt6localeneERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='237' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-720' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <return type-id='type-id-23'/>
           </function-decl>
@@ -14808,8 +14809,8 @@
         </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-718' is-artificial='yes'/>
-            <parameter type-id='type-id-687'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -14825,68 +14826,68 @@
         </member-function>
         <member-function access='private' static='yes'>
           <function-decl name='_S_normalize_category' mangled-name='_ZNSt6locale21_S_normalize_categoryEi' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='322' 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-681'/>
-            <return type-id='type-id-681'/>
+            <parameter type-id='type-id-682'/>
+            <return type-id='type-id-682'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_coalesce' mangled-name='_ZNSt6locale11_M_coalesceERKS_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='325' 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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-681'/>
+            <parameter type-id='type-id-682'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
-            <parameter type-id='type-id-687'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
+            <parameter type-id='type-id-688'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-31'/>
-            <parameter type-id='type-id-681'/>
+            <parameter type-id='type-id-682'/>
             <return type-id='type-id-4'/>
           </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-718' is-artificial='yes'/>
+            <parameter type-id='type-id-719' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-681'/>
+            <parameter type-id='type-id-682'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -14894,860 +14895,860 @@
     </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-21'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-721' filepath='/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-720'/>
+          <typedef-decl name='iter_type' type-id='type-id-722' filepath='/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-721'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-722'/>
+          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-723'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-692' is-artificial='yes'/>
+            <parameter type-id='type-id-693' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-100'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-302'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-301'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-317'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-316'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-310'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-315'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-314'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-312'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_find&lt;char&gt;' mangled-name='_ZNKSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE7_M_findIcEEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEiE6__typeEPKS9_mS9_' filepath='/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-723' is-artificial='yes'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-725'/>
+            <return type-id='type-id-726'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <parameter type-id='type-id-726'/>
-            <return type-id='type-id-721'/>
+            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-317'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-316'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-315'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-314'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-312'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-721'/>
-            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-722'/>
+            <parameter type-id='type-id-722'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-692' is-artificial='yes'/>
+            <parameter type-id='type-id-693' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-692' is-artificial='yes'/>
+            <parameter type-id='type-id-693' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-692' is-artificial='yes'/>
+            <parameter type-id='type-id-693' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-692' is-artificial='yes'/>
+            <parameter type-id='type-id-693' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-310'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-312'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-314'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-315'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-316'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-317'/>
-            <return type-id='type-id-720'/>
+            <return type-id='type-id-721'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-301'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-302'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-723' is-artificial='yes'/>
-            <parameter type-id='type-id-720'/>
-            <parameter type-id='type-id-720'/>
+            <parameter type-id='type-id-724' is-artificial='yes'/>
+            <parameter type-id='type-id-721'/>
+            <parameter type-id='type-id-721'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-100'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-111'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-728' filepath='/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-727'/>
+          <typedef-decl name='iter_type' type-id='type-id-729' filepath='/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-728'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-729'/>
+          <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-730'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-704' is-artificial='yes'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-100'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-302'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-301'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-317'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-316'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-310'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-315'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-314'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-312'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_find&lt;wchar_t&gt;' mangled-name='_ZNKSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE7_M_findIwEEN9__gnu_cxx11__enable_ifIXsrSt9__is_charIT_E7__valueEiE6__typeEPKS9_mS9_' filepath='/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-730' is-artificial='yes'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
             <parameter type-id='type-id-249'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-105'/>
-            <return type-id='type-id-725'/>
+            <return type-id='type-id-726'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <parameter type-id='type-id-726'/>
-            <return type-id='type-id-728'/>
+            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-317'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-316'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-315'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-314'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-312'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-728'/>
-            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-729'/>
+            <parameter type-id='type-id-729'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-704' is-artificial='yes'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-704' is-artificial='yes'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-704' is-artificial='yes'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-704' is-artificial='yes'/>
+            <parameter type-id='type-id-705' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-310'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-99'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-312'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-314'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-315'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-316'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-317'/>
-            <return type-id='type-id-727'/>
+            <return type-id='type-id-728'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-301'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-302'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-730' is-artificial='yes'/>
-            <parameter type-id='type-id-727'/>
-            <parameter type-id='type-id-727'/>
+            <parameter type-id='type-id-731' is-artificial='yes'/>
+            <parameter type-id='type-id-728'/>
+            <parameter type-id='type-id-728'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-100'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-19'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-731'/>
+          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-732'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-733' filepath='/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-732'/>
+          <typedef-decl name='iter_type' type-id='type-id-734' filepath='/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-733'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-693' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-55'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-69'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-540'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-541'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-536'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </function-decl>
         </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-734' is-artificial='yes'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-15'/>
@@ -15760,7 +15761,7 @@
         </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-734' is-artificial='yes'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-15'/>
@@ -15773,7 +15774,7 @@
         </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-734' is-artificial='yes'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-48'/>
             <parameter type-id='type-id-102'/>
@@ -15785,278 +15786,278 @@
         </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-734'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-734'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-536'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-734'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-541'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-734'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-540'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-734'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-69'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-733'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-734'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-55'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-693' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-693' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-693' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-693' is-artificial='yes'/>
+            <parameter type-id='type-id-694' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-55'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-69'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-540'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-541'/>
-            <return type-id='type-id-732'/>
+            <return type-id='type-id-733'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-536'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-734' is-artificial='yes'/>
-            <parameter type-id='type-id-732'/>
+            <parameter type-id='type-id-735' is-artificial='yes'/>
+            <parameter type-id='type-id-733'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-731'/>
+            <parameter type-id='type-id-732'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-109'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-736' filepath='/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-735'/>
+          <typedef-decl name='iter_type' type-id='type-id-737' filepath='/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-736'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-737'/>
+          <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-738'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-705' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-536'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-541'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-540'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-69'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-55'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </function-decl>
         </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-738' is-artificial='yes'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-105'/>
@@ -16069,7 +16070,7 @@
         </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-738' is-artificial='yes'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-105'/>
@@ -16082,7 +16083,7 @@
         </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-738' is-artificial='yes'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-48'/>
             <parameter type-id='type-id-102'/>
@@ -16094,217 +16095,217 @@
         </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-737'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-737'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-536'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-737'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-541'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-737'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-540'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-737'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-69'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-736'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-737'/>
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-105'/>
             <parameter type-id='type-id-55'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-705' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-705' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-705' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-705' is-artificial='yes'/>
+            <parameter type-id='type-id-706' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-23'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-55'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-69'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-540'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-541'/>
-            <return type-id='type-id-735'/>
+            <return type-id='type-id-736'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-536'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-738' is-artificial='yes'/>
-            <parameter type-id='type-id-735'/>
+            <parameter type-id='type-id-739' is-artificial='yes'/>
+            <parameter type-id='type-id-736'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-737'/>
+            <parameter type-id='type-id-738'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
-    <pointer-type-def type-id='type-id-739' size-in-bits='64' id='type-id-451'/>
-    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-453'/>
-    <pointer-type-def type-id='type-id-741' size-in-bits='64' id='type-id-461'/>
-    <reference-type-def kind='lvalue' type-id='type-id-742' size-in-bits='64' id='type-id-463'/>
-    <pointer-type-def type-id='type-id-743' size-in-bits='64' id='type-id-492'/>
-    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-494'/>
-    <pointer-type-def type-id='type-id-745' size-in-bits='64' id='type-id-482'/>
-    <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-484'/>
-    <pointer-type-def type-id='type-id-747' size-in-bits='64' id='type-id-393'/>
-    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-417'/>
+    <pointer-type-def type-id='type-id-740' size-in-bits='64' id='type-id-451'/>
+    <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-453'/>
+    <pointer-type-def type-id='type-id-742' size-in-bits='64' id='type-id-461'/>
+    <reference-type-def kind='lvalue' type-id='type-id-743' size-in-bits='64' id='type-id-463'/>
+    <pointer-type-def type-id='type-id-744' size-in-bits='64' id='type-id-492'/>
+    <reference-type-def kind='lvalue' type-id='type-id-745' size-in-bits='64' id='type-id-494'/>
+    <pointer-type-def type-id='type-id-746' size-in-bits='64' id='type-id-482'/>
+    <reference-type-def kind='lvalue' type-id='type-id-747' size-in-bits='64' id='type-id-484'/>
+    <pointer-type-def type-id='type-id-748' size-in-bits='64' id='type-id-393'/>
+    <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-417'/>
     <reference-type-def kind='lvalue' type-id='type-id-560' size-in-bits='64' id='type-id-34'/>
-    <pointer-type-def type-id='type-id-749' size-in-bits='64' id='type-id-25'/>
-    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-27'/>
-    <pointer-type-def type-id='type-id-751' size-in-bits='64' id='type-id-26'/>
+    <pointer-type-def type-id='type-id-750' size-in-bits='64' id='type-id-25'/>
+    <pointer-type-def type-id='type-id-751' size-in-bits='64' id='type-id-27'/>
+    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-26'/>
     <reference-type-def kind='lvalue' type-id='type-id-564' size-in-bits='64' id='type-id-119'/>
-    <pointer-type-def type-id='type-id-752' size-in-bits='64' id='type-id-114'/>
-    <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-116'/>
-    <pointer-type-def type-id='type-id-754' size-in-bits='64' id='type-id-115'/>
-    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-318'/>
-    <pointer-type-def type-id='type-id-756' size-in-bits='64' id='type-id-344'/>
-    <reference-type-def kind='lvalue' type-id='type-id-757' size-in-bits='64' id='type-id-53'/>
-    <pointer-type-def type-id='type-id-758' size-in-bits='64' id='type-id-49'/>
-    <reference-type-def kind='lvalue' type-id='type-id-759' size-in-bits='64' id='type-id-134'/>
-    <pointer-type-def type-id='type-id-760' size-in-bits='64' id='type-id-132'/>
-    <reference-type-def kind='lvalue' type-id='type-id-761' size-in-bits='64' id='type-id-101'/>
-    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-96'/>
-    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-90'/>
+    <pointer-type-def type-id='type-id-753' size-in-bits='64' id='type-id-114'/>
+    <pointer-type-def type-id='type-id-754' size-in-bits='64' id='type-id-116'/>
+    <pointer-type-def type-id='type-id-755' size-in-bits='64' id='type-id-115'/>
+    <pointer-type-def type-id='type-id-756' size-in-bits='64' id='type-id-318'/>
+    <pointer-type-def type-id='type-id-757' size-in-bits='64' id='type-id-344'/>
+    <reference-type-def kind='lvalue' type-id='type-id-758' size-in-bits='64' id='type-id-53'/>
+    <pointer-type-def type-id='type-id-759' size-in-bits='64' id='type-id-49'/>
+    <reference-type-def kind='lvalue' type-id='type-id-760' size-in-bits='64' id='type-id-134'/>
+    <pointer-type-def type-id='type-id-761' size-in-bits='64' id='type-id-132'/>
+    <reference-type-def kind='lvalue' type-id='type-id-762' size-in-bits='64' id='type-id-101'/>
+    <pointer-type-def type-id='type-id-762' size-in-bits='64' id='type-id-96'/>
+    <pointer-type-def type-id='type-id-763' size-in-bits='64' id='type-id-90'/>
     <qualified-type-def type-id='type-id-72' const='yes' id='type-id-91'/>
     <qualified-type-def type-id='type-id-29' const='yes' id='type-id-92'/>
     <qualified-type-def type-id='type-id-51' const='yes' id='type-id-93'/>
     <qualified-type-def type-id='type-id-50' const='yes' id='type-id-94'/>
-    <reference-type-def kind='lvalue' type-id='type-id-763' size-in-bits='64' id='type-id-31'/>
-    <reference-type-def kind='lvalue' type-id='type-id-764' size-in-bits='64' id='type-id-213'/>
-    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-214'/>
-    <reference-type-def kind='lvalue' type-id='type-id-765' size-in-bits='64' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-202'/>
-    <reference-type-def kind='lvalue' type-id='type-id-766' size-in-bits='64' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-268'/>
-    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-279'/>
-    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-280'/>
-    <reference-type-def kind='lvalue' type-id='type-id-768' size-in-bits='64' id='type-id-89'/>
+    <reference-type-def kind='lvalue' type-id='type-id-764' size-in-bits='64' id='type-id-31'/>
+    <reference-type-def kind='lvalue' type-id='type-id-765' size-in-bits='64' id='type-id-213'/>
+    <pointer-type-def type-id='type-id-765' size-in-bits='64' id='type-id-214'/>
+    <reference-type-def kind='lvalue' type-id='type-id-766' size-in-bits='64' id='type-id-201'/>
+    <pointer-type-def type-id='type-id-766' size-in-bits='64' id='type-id-202'/>
+    <reference-type-def kind='lvalue' type-id='type-id-767' size-in-bits='64' id='type-id-267'/>
+    <pointer-type-def type-id='type-id-767' size-in-bits='64' id='type-id-268'/>
+    <reference-type-def kind='lvalue' type-id='type-id-768' size-in-bits='64' id='type-id-279'/>
+    <pointer-type-def type-id='type-id-768' size-in-bits='64' id='type-id-280'/>
+    <reference-type-def kind='lvalue' type-id='type-id-769' size-in-bits='64' id='type-id-89'/>
     <reference-type-def kind='lvalue' type-id='type-id-536' size-in-bits='64' id='type-id-302'/>
     <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-73'>
@@ -16359,26 +16360,26 @@
     <pointer-type-def type-id='type-id-409' size-in-bits='64' id='type-id-416'/>
     <reference-type-def kind='lvalue' type-id='type-id-12' size-in-bits='64' id='type-id-35'/>
     <reference-type-def kind='lvalue' type-id='type-id-103' size-in-bits='64' id='type-id-120'/>
-    <pointer-type-def type-id='type-id-769' size-in-bits='64' id='type-id-308'/>
-    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-770' size-in-bits='64' id='type-id-308'/>
+    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-307'/>
     <reference-type-def kind='lvalue' type-id='type-id-293' size-in-bits='64' id='type-id-320'/>
     <pointer-type-def type-id='type-id-293' size-in-bits='64' id='type-id-305'/>
     <reference-type-def kind='lvalue' type-id='type-id-294' size-in-bits='64' id='type-id-319'/>
     <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-306'/>
-    <pointer-type-def type-id='type-id-771' size-in-bits='64' id='type-id-343'/>
-    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-772' size-in-bits='64' id='type-id-343'/>
+    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-342'/>
     <reference-type-def kind='lvalue' type-id='type-id-332' size-in-bits='64' id='type-id-346'/>
     <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-340'/>
     <reference-type-def kind='lvalue' type-id='type-id-333' size-in-bits='64' id='type-id-345'/>
     <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-341'/>
-    <pointer-type-def type-id='type-id-773' size-in-bits='64' id='type-id-22'/>
-    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-112'/>
+    <pointer-type-def type-id='type-id-774' size-in-bits='64' id='type-id-22'/>
+    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-112'/>
     <reference-type-def kind='lvalue' type-id='type-id-45' size-in-bits='64' id='type-id-54'/>
     <pointer-type-def type-id='type-id-45' size-in-bits='64' id='type-id-52'/>
     <reference-type-def kind='lvalue' type-id='type-id-129' size-in-bits='64' id='type-id-135'/>
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-133'/>
     <reference-type-def kind='lvalue' type-id='type-id-13' size-in-bits='64' id='type-id-102'/>
-    <pointer-type-def type-id='type-id-775' size-in-bits='64' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-776' size-in-bits='64' id='type-id-309'/>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-97'/>
     <pointer-type-def type-id='type-id-83' size-in-bits='64' id='type-id-84'/>
     <pointer-type-def type-id='type-id-75' size-in-bits='64' id='type-id-76'/>
@@ -16398,7 +16399,7 @@
     </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-185'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-776'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-777'/>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
@@ -16414,185 +16415,185 @@
       <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-270'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_lock' type-id='type-id-777' 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-391'/>
+      <typedef-decl name='__c_lock' type-id='type-id-778' 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-391'/>
     </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-778'>
+      <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-779'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-441' 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-207'/>
         </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-778'>
+      <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-779'>
         <member-type access='public'>
           <typedef-decl name='pointer' 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_base_types.h' line='155' column='1' id='type-id-209'/>
         </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-778'>
+      <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-779'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-443' 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-211'/>
         </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-779'>
+      <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-780'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-454' 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-195'/>
         </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-779'>
+      <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-780'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-458' 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-197'/>
         </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-779'>
+      <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-780'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-456' 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-199'/>
         </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-780'>
+      <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-781'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-485' 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-261'/>
         </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-780'>
+      <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-781'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-489' 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-263'/>
         </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-780'>
+      <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-781'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-487' 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-265'/>
         </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-781'>
+      <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-782'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-472' 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-273'/>
         </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-781'>
+      <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-782'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-476' 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-275'/>
         </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-781'>
+      <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-782'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-474' 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-277'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-782'>
+      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-783'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='180' column='1' id='type-id-442'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-782'>
+      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-783'>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-783' 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='178' column='1' id='type-id-448'/>
+          <typedef-decl name='iterator_category' type-id='type-id-784' 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='178' column='1' id='type-id-448'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-782'>
+      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-783'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-149' 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='181' column='1' id='type-id-446'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-782'>
+      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-783'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-187' 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='182' column='1' id='type-id-444'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <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-784'>
+      <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-785'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='191' column='1' id='type-id-455'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <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-784'>
+      <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-785'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-11' 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='192' column='1' id='type-id-459'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <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-784'>
+      <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-785'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-188' 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-457'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;const wchar_t*&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-785'>
+      <class-decl name='iterator_traits&lt;const wchar_t*&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-786'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='191' column='1' id='type-id-486'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;const wchar_t*&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-785'>
+      <class-decl name='iterator_traits&lt;const wchar_t*&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-786'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-249' 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='192' column='1' id='type-id-490'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;const wchar_t*&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-785'>
+      <class-decl name='iterator_traits&lt;const wchar_t*&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-786'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-255' 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-488'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-786'>
+      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-787'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='180' column='1' id='type-id-473'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-786'>
+      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-787'>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-783' 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='178' column='1' id='type-id-479'/>
+          <typedef-decl name='iterator_category' type-id='type-id-784' 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='178' column='1' id='type-id-479'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-786'>
+      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-787'>
         <member-type access='public'>
           <typedef-decl name='pointer' type-id='type-id-219' 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='181' column='1' id='type-id-477'/>
         </member-type>
       </class-decl>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-786'>
+      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-787'>
         <member-type access='public'>
           <typedef-decl name='reference' type-id='type-id-254' 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='182' column='1' id='type-id-475'/>
         </member-type>
@@ -16602,38 +16603,37 @@
       <typedef-decl name='streamoff' type-id='type-id-55' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='90' column='1' id='type-id-60'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <typedef-decl name='streampos' type-id='type-id-787' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='230' column='1' id='type-id-59'/>
+      <typedef-decl name='streampos' 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/bits/postypes.h' line='230' column='1' id='type-id-59'/>
     </namespace-decl>
     <namespace-decl name='std'>
       <typedef-decl name='string' type-id='type-id-146' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stringfwd.h' line='65' column='1' id='type-id-87'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <typedef-decl name='wstreampos' type-id='type-id-787' 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-139'/>
+      <typedef-decl name='wstreampos' 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/bits/postypes.h' line='232' column='1' id='type-id-139'/>
     </namespace-decl>
     <reference-type-def kind='lvalue' type-id='type-id-502' size-in-bits='64' id='type-id-314'/>
     <reference-type-def kind='lvalue' type-id='type-id-69' size-in-bits='64' id='type-id-315'/>
     <reference-type-def kind='lvalue' type-id='type-id-507' size-in-bits='64' id='type-id-312'/>
-    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-79'/>
+    <pointer-type-def type-id='type-id-789' size-in-bits='64' id='type-id-79'/>
     <reference-type-def kind='lvalue' type-id='type-id-33' size-in-bits='64' id='type-id-100'/>
     <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-304'/>
-    <reference-type-def kind='lvalue' type-id='type-id-789' size-in-bits='64' id='type-id-481'/>
-    <qualified-type-def type-id='type-id-149' const='yes' id='type-id-596'/>
-    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-684'/>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='1024' id='type-id-651'>
-      <subrange length='128' type-id='type-id-515' id='type-id-790'/>
+    <reference-type-def kind='lvalue' type-id='type-id-790' size-in-bits='64' id='type-id-481'/>
+    <qualified-type-def type-id='type-id-149' const='yes' id='type-id-597'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-685'/>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='1024' id='type-id-652'>
+      <subrange length='128' type-id='type-id-515' id='type-id-791'/>
 
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='2048' id='type-id-640'>
-      <subrange length='256' type-id='type-id-515' id='type-id-791'/>
+    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='2048' id='type-id-641'>
+      <subrange length='256' type-id='type-id-515' id='type-id-792'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-792' const='yes' id='type-id-671'/>
     <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-601'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-602'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-793'/>
         <member-type access='private'>
-          <typedef-decl name='result' type-id='type-id-614' 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-794'/>
+          <typedef-decl name='result' type-id='type-id-615' 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-794'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='intern_type' type-id='type-id-15' 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-795'/>
@@ -16803,11 +16803,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-619'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-620'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-793'/>
         <member-type access='private'>
-          <typedef-decl name='result' type-id='type-id-614' 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-630'/>
+          <typedef-decl name='result' type-id='type-id-615' 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-631'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='intern_type' type-id='type-id-105' 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-809'/>
@@ -16835,7 +16835,7 @@
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-818'/>
-            <return type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -16845,7 +16845,7 @@
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-818'/>
-            <return type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -16858,7 +16858,7 @@
             <parameter type-id='type-id-821'/>
             <parameter type-id='type-id-821'/>
             <parameter type-id='type-id-822'/>
-            <return type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -16920,7 +16920,7 @@
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-818'/>
-            <return type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -16930,7 +16930,7 @@
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-817'/>
             <parameter type-id='type-id-818'/>
-            <return type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -16943,7 +16943,7 @@
             <parameter type-id='type-id-821'/>
             <parameter type-id='type-id-821'/>
             <parameter type-id='type-id-822'/>
-            <return type-id='type-id-630'/>
+            <return type-id='type-id-631'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -16977,9 +16977,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-648'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-649'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-637'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-823'/>
         </member-type>
@@ -17008,7 +17008,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='is' mangled-name='_ZNKSt21__ctype_abstract_baseIwE2isEtw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-823'/>
             <return type-id='type-id-23'/>
           </function-decl>
@@ -17027,14 +17027,14 @@
             <parameter type-id='type-id-824' is-artificial='yes'/>
             <parameter type-id='type-id-827'/>
             <parameter type-id='type-id-827'/>
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-827'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='scan_is' mangled-name='_ZNKSt21__ctype_abstract_baseIwE7scan_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='197' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-827'/>
             <parameter type-id='type-id-827'/>
             <return type-id='type-id-827'/>
@@ -17043,7 +17043,7 @@
         <member-function access='private' const='yes'>
           <function-decl name='scan_not' mangled-name='_ZNKSt21__ctype_abstract_baseIwE8scan_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='213' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-824' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-827'/>
             <parameter type-id='type-id-827'/>
             <return type-id='type-id-827'/>
@@ -17113,7 +17113,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-824' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-823'/>
             <return type-id='type-id-23'/>
           </function-decl>
@@ -17123,14 +17123,14 @@
             <parameter type-id='type-id-824' is-artificial='yes'/>
             <parameter type-id='type-id-827'/>
             <parameter type-id='type-id-827'/>
-            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-646'/>
             <return type-id='type-id-827'/>
           </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-824' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-827'/>
             <parameter type-id='type-id-827'/>
             <return type-id='type-id-827'/>
@@ -17139,7 +17139,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-824' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
+            <parameter type-id='type-id-645'/>
             <parameter type-id='type-id-827'/>
             <parameter type-id='type-id-827'/>
             <return type-id='type-id-827'/>
@@ -17212,10 +17212,10 @@
       </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-773'>
+      <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-774'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-12'/>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-773' 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-828'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-774' 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-828'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__streambuf_type' type-id='type-id-37' 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-829'/>
@@ -17593,10 +17593,10 @@
       </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-774'>
+      <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-775'>
         <base-class access='public' layout-offset-in-bits='192' is-virtual='yes' type-id='type-id-103'/>
         <member-type access='private'>
-          <typedef-decl name='__ostream_type' type-id='type-id-774' 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-846'/>
+          <typedef-decl name='__ostream_type' type-id='type-id-775' 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-846'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='__streambuf_type' type-id='type-id-121' 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-847'/>
@@ -17974,7 +17974,7 @@
       </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-787'>
+      <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-788'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_off' type-id='type-id-60' 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='117' column='1'/>
         </data-member>
@@ -18031,14 +18031,14 @@
           <function-decl name='operator+' mangled-name='_ZNKSt4fposI11__mbstate_tEplEl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-865' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-787'/>
+            <return type-id='type-id-788'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator-' mangled-name='_ZNKSt4fposI11__mbstate_tEmiEl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/postypes.h' line='194' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-865' is-artificial='yes'/>
             <parameter type-id='type-id-60'/>
-            <return type-id='type-id-787'/>
+            <return type-id='type-id-788'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -18051,7 +18051,7 @@
       </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-721'>
+      <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-722'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-356'/>
         <member-type access='private'>
           <typedef-decl name='streambuf_type' type-id='type-id-37' 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-868'/>
@@ -18107,7 +18107,7 @@
           <function-decl name='operator++' mangled-name='_ZNSt19istreambuf_iteratorIcSt11char_traitsIcEEppEi' 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='154' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-873' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -18132,7 +18132,7 @@
       </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-728'>
+      <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-729'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-368'/>
         <member-type access='private'>
           <typedef-decl name='streambuf_type' type-id='type-id-121' 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-878'/>
@@ -18188,7 +18188,7 @@
           <function-decl name='operator++' mangled-name='_ZNSt19istreambuf_iteratorIwSt11char_traitsIwEEppEi' 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='154' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-883' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -18213,13 +18213,13 @@
       </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-733'>
+      <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-734'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-888'/>
         <member-type access='private'>
           <typedef-decl name='streambuf_type' type-id='type-id-37' 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-889'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='ostream_type' type-id='type-id-773' 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-890'/>
+          <typedef-decl name='ostream_type' type-id='type-id-774' 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-890'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_sbuf' type-id='type-id-891' 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'/>
@@ -18284,13 +18284,13 @@
       </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-736'>
+      <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-737'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-888'/>
         <member-type access='private'>
           <typedef-decl name='streambuf_type' type-id='type-id-121' 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-896'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='ostream_type' type-id='type-id-774' 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-897'/>
+          <typedef-decl name='ostream_type' type-id='type-id-775' 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-897'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_sbuf' type-id='type-id-898' 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'/>
@@ -18354,83 +18354,87 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-739'/>
-    <qualified-type-def type-id='type-id-441' const='yes' id='type-id-740'/>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-741'/>
-    <qualified-type-def type-id='type-id-454' const='yes' id='type-id-742'/>
-    <qualified-type-def type-id='type-id-231' const='yes' id='type-id-743'/>
-    <qualified-type-def type-id='type-id-485' const='yes' id='type-id-744'/>
-    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-745'/>
-    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-746'/>
-    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-717'/>
-    <array-type-def dimensions='1' type-id='type-id-690' size-in-bits='infinite' id='type-id-686'>
+    <qualified-type-def type-id='type-id-160' const='yes' id='type-id-740'/>
+    <qualified-type-def type-id='type-id-441' const='yes' id='type-id-741'/>
+    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-742'/>
+    <qualified-type-def type-id='type-id-454' const='yes' id='type-id-743'/>
+    <qualified-type-def type-id='type-id-231' const='yes' id='type-id-744'/>
+    <qualified-type-def type-id='type-id-485' const='yes' id='type-id-745'/>
+    <qualified-type-def type-id='type-id-229' const='yes' id='type-id-746'/>
+    <qualified-type-def type-id='type-id-472' const='yes' id='type-id-747'/>
+    <qualified-type-def type-id='type-id-903' const='yes' id='type-id-718'/>
+    <array-type-def dimensions='1' type-id='type-id-595' size-in-bits='16' id='type-id-672'>
+      <subrange length='2' type-id='type-id-515' id='type-id-904'/>
+
+    </array-type-def>
+    <array-type-def dimensions='1' type-id='type-id-691' size-in-bits='infinite' id='type-id-687'>
       <subrange length='infinite' id='type-id-567'/>
 
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-680' size-in-bits='infinite' id='type-id-685'>
+    <array-type-def dimensions='1' type-id='type-id-681' size-in-bits='infinite' id='type-id-686'>
       <subrange length='infinite' id='type-id-567'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-904' size-in-bits='64' id='type-id-600'/>
-    <qualified-type-def type-id='type-id-385' const='yes' id='type-id-747'/>
-    <qualified-type-def type-id='type-id-410' const='yes' id='type-id-748'/>
-    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-749'/>
-    <qualified-type-def type-id='type-id-20' const='yes' id='type-id-750'/>
-    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-751'/>
-    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-752'/>
-    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-753'/>
-    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-754'/>
-    <qualified-type-def type-id='type-id-282' const='yes' id='type-id-755'/>
-    <qualified-type-def type-id='type-id-321' const='yes' id='type-id-756'/>
-    <qualified-type-def type-id='type-id-45' const='yes' id='type-id-757'/>
-    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-758'/>
-    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-759'/>
-    <qualified-type-def type-id='type-id-122' const='yes' id='type-id-760'/>
-    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-608'/>
-    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-615'/>
-    <reference-type-def kind='lvalue' type-id='type-id-615' size-in-bits='64' id='type-id-616'/>
-    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-610'/>
-    <reference-type-def kind='lvalue' type-id='type-id-610' size-in-bits='64' id='type-id-611'/>
-    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-624'/>
-    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-631'/>
-    <reference-type-def kind='lvalue' type-id='type-id-631' size-in-bits='64' id='type-id-632'/>
-    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-626'/>
-    <reference-type-def kind='lvalue' type-id='type-id-626' size-in-bits='64' id='type-id-627'/>
-    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-643'/>
-    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-647'/>
-    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-905' size-in-bits='64' id='type-id-601'/>
+    <qualified-type-def type-id='type-id-385' const='yes' id='type-id-748'/>
+    <qualified-type-def type-id='type-id-410' const='yes' id='type-id-749'/>
+    <qualified-type-def type-id='type-id-16' const='yes' id='type-id-750'/>
+    <qualified-type-def type-id='type-id-20' const='yes' id='type-id-751'/>
+    <qualified-type-def type-id='type-id-18' const='yes' id='type-id-752'/>
+    <qualified-type-def type-id='type-id-106' const='yes' id='type-id-753'/>
+    <qualified-type-def type-id='type-id-110' const='yes' id='type-id-754'/>
+    <qualified-type-def type-id='type-id-108' const='yes' id='type-id-755'/>
+    <qualified-type-def type-id='type-id-282' const='yes' id='type-id-756'/>
+    <qualified-type-def type-id='type-id-321' const='yes' id='type-id-757'/>
+    <qualified-type-def type-id='type-id-45' const='yes' id='type-id-758'/>
+    <qualified-type-def type-id='type-id-38' const='yes' id='type-id-759'/>
+    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-760'/>
+    <qualified-type-def type-id='type-id-122' const='yes' id='type-id-761'/>
+    <pointer-type-def type-id='type-id-906' size-in-bits='64' id='type-id-609'/>
+    <pointer-type-def type-id='type-id-907' size-in-bits='64' id='type-id-616'/>
+    <reference-type-def kind='lvalue' type-id='type-id-616' size-in-bits='64' id='type-id-617'/>
+    <pointer-type-def type-id='type-id-908' size-in-bits='64' id='type-id-611'/>
+    <reference-type-def kind='lvalue' type-id='type-id-611' size-in-bits='64' id='type-id-612'/>
+    <pointer-type-def type-id='type-id-909' size-in-bits='64' id='type-id-625'/>
+    <pointer-type-def type-id='type-id-910' size-in-bits='64' id='type-id-632'/>
+    <reference-type-def kind='lvalue' type-id='type-id-632' size-in-bits='64' id='type-id-633'/>
+    <pointer-type-def type-id='type-id-911' size-in-bits='64' id='type-id-627'/>
+    <reference-type-def kind='lvalue' type-id='type-id-627' size-in-bits='64' id='type-id-628'/>
+    <pointer-type-def type-id='type-id-912' size-in-bits='64' id='type-id-644'/>
+    <pointer-type-def type-id='type-id-913' size-in-bits='64' id='type-id-648'/>
     <pointer-type-def type-id='type-id-914' size-in-bits='64' id='type-id-657'/>
-    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-639'/>
-    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-660'/>
-    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-665'/>
-    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-670'/>
-    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-761'/>
-    <qualified-type-def type-id='type-id-85' const='yes' id='type-id-762'/>
-    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-763'/>
-    <pointer-type-def type-id='type-id-763' size-in-bits='64' id='type-id-719'/>
-    <reference-type-def kind='lvalue' type-id='type-id-919' size-in-bits='64' id='type-id-688'/>
-    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-689'/>
-    <qualified-type-def type-id='type-id-681' const='yes' id='type-id-716'/>
-    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-676'/>
-    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-675'/>
-    <pointer-type-def type-id='type-id-675' size-in-bits='64' id='type-id-683'/>
-    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-679'/>
-    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-680'/>
-    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-690'/>
-    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-723'/>
-    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-730'/>
-    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-734'/>
-    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-738'/>
-    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-764'/>
-    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-765'/>
-    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-766'/>
-    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-767'/>
-    <qualified-type-def type-id='type-id-66' const='yes' id='type-id-641'/>
-    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-768'/>
+    <pointer-type-def type-id='type-id-915' size-in-bits='64' id='type-id-658'/>
+    <pointer-type-def type-id='type-id-916' size-in-bits='64' id='type-id-640'/>
+    <pointer-type-def type-id='type-id-917' size-in-bits='64' id='type-id-661'/>
+    <pointer-type-def type-id='type-id-918' size-in-bits='64' id='type-id-666'/>
+    <pointer-type-def type-id='type-id-919' size-in-bits='64' id='type-id-671'/>
+    <qualified-type-def type-id='type-id-13' const='yes' id='type-id-762'/>
+    <qualified-type-def type-id='type-id-85' const='yes' id='type-id-763'/>
+    <qualified-type-def type-id='type-id-32' const='yes' id='type-id-764'/>
+    <pointer-type-def type-id='type-id-764' size-in-bits='64' id='type-id-720'/>
+    <reference-type-def kind='lvalue' type-id='type-id-920' size-in-bits='64' id='type-id-689'/>
+    <pointer-type-def type-id='type-id-920' size-in-bits='64' id='type-id-690'/>
+    <qualified-type-def type-id='type-id-682' const='yes' id='type-id-717'/>
+    <reference-type-def kind='lvalue' type-id='type-id-921' size-in-bits='64' id='type-id-677'/>
+    <pointer-type-def type-id='type-id-921' size-in-bits='64' id='type-id-676'/>
+    <pointer-type-def type-id='type-id-676' size-in-bits='64' id='type-id-684'/>
+    <reference-type-def kind='lvalue' type-id='type-id-922' size-in-bits='64' id='type-id-680'/>
+    <pointer-type-def type-id='type-id-922' size-in-bits='64' id='type-id-681'/>
+    <pointer-type-def type-id='type-id-923' size-in-bits='64' id='type-id-691'/>
+    <pointer-type-def type-id='type-id-924' size-in-bits='64' id='type-id-724'/>
+    <pointer-type-def type-id='type-id-925' size-in-bits='64' id='type-id-731'/>
+    <pointer-type-def type-id='type-id-926' size-in-bits='64' id='type-id-735'/>
+    <pointer-type-def type-id='type-id-927' size-in-bits='64' id='type-id-739'/>
+    <qualified-type-def type-id='type-id-166' const='yes' id='type-id-765'/>
+    <qualified-type-def type-id='type-id-164' const='yes' id='type-id-766'/>
+    <qualified-type-def type-id='type-id-233' const='yes' id='type-id-767'/>
+    <qualified-type-def type-id='type-id-235' const='yes' id='type-id-768'/>
+    <qualified-type-def type-id='type-id-66' const='yes' id='type-id-642'/>
+    <qualified-type-def type-id='type-id-87' const='yes' id='type-id-769'/>
     <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-793'>
         <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-614'>
+          <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-615'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='ok' value='0'/>
             <enumerator name='partial' value='1'/>
@@ -18440,181 +18444,177 @@
         </member-type>
       </class-decl>
     </namespace-decl>
-    <function-type size-in-bits='64' id='type-id-769'>
-      <parameter type-id='type-id-927'/>
-      <return type-id='type-id-927'/>
-    </function-type>
     <function-type size-in-bits='64' id='type-id-770'>
-      <parameter type-id='type-id-300'/>
-      <return type-id='type-id-300'/>
-    </function-type>
-    <function-type size-in-bits='64' id='type-id-771'>
       <parameter type-id='type-id-928'/>
       <return type-id='type-id-928'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-771'>
+      <parameter type-id='type-id-300'/>
+      <return type-id='type-id-300'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-772'>
+      <parameter type-id='type-id-929'/>
+      <return type-id='type-id-929'/>
+    </function-type>
+    <function-type size-in-bits='64' id='type-id-773'>
       <parameter type-id='type-id-339'/>
       <return type-id='type-id-339'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-775'>
+    <function-type size-in-bits='64' id='type-id-776'>
       <parameter type-id='type-id-102'/>
       <return type-id='type-id-102'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-788'>
+    <function-type size-in-bits='64' id='type-id-789'>
       <parameter type-id='type-id-74'/>
       <parameter type-id='type-id-102'/>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-598'/>
-    <pointer-type-def type-id='type-id-929' size-in-bits='64' id='type-id-597'/>
-    <reference-type-def kind='lvalue' type-id='type-id-605' size-in-bits='64' id='type-id-674'/>
-    <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-599'/>
-    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-699'/>
-    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-711'/>
-    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-607'/>
-    <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-612'/>
-    <reference-type-def kind='lvalue' type-id='type-id-612' size-in-bits='64' id='type-id-613'/>
-    <pointer-type-def type-id='type-id-602' size-in-bits='64' id='type-id-617'/>
-    <reference-type-def kind='lvalue' type-id='type-id-617' size-in-bits='64' id='type-id-618'/>
-    <reference-type-def kind='lvalue' type-id='type-id-604' size-in-bits='64' id='type-id-609'/>
-    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-623'/>
-    <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-628'/>
-    <reference-type-def kind='lvalue' type-id='type-id-628' size-in-bits='64' id='type-id-629'/>
-    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-633'/>
-    <reference-type-def kind='lvalue' type-id='type-id-633' size-in-bits='64' id='type-id-634'/>
-    <reference-type-def kind='lvalue' type-id='type-id-622' size-in-bits='64' id='type-id-625'/>
-    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-694'/>
-    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-706'/>
-    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-642'/>
-    <pointer-type-def type-id='type-id-637' size-in-bits='64' id='type-id-646'/>
-    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-655'/>
-    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-658'/>
-    <pointer-type-def type-id='type-id-644' size-in-bits='64' id='type-id-645'/>
-    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-659'/>
-    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-664'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-669'/>
-    <reference-type-def kind='lvalue' type-id='type-id-29' size-in-bits='64' id='type-id-724'/>
-    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-718'/>
-    <pointer-type-def type-id='type-id-682' size-in-bits='64' id='type-id-687'/>
-    <reference-type-def kind='lvalue' type-id='type-id-635' size-in-bits='64' id='type-id-677'/>
-    <pointer-type-def type-id='type-id-635' size-in-bits='64' id='type-id-673'/>
-    <pointer-type-def type-id='type-id-606' size-in-bits='64' id='type-id-678'/>
-    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-702'/>
-    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-714'/>
-    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-697'/>
-    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-709'/>
-    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-698'/>
-    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-710'/>
-    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-695'/>
+    <pointer-type-def type-id='type-id-382' size-in-bits='64' id='type-id-599'/>
+    <pointer-type-def type-id='type-id-930' size-in-bits='64' id='type-id-598'/>
+    <reference-type-def kind='lvalue' type-id='type-id-606' size-in-bits='64' id='type-id-675'/>
+    <pointer-type-def type-id='type-id-391' size-in-bits='64' id='type-id-600'/>
+    <pointer-type-def type-id='type-id-931' size-in-bits='64' id='type-id-700'/>
+    <pointer-type-def type-id='type-id-932' size-in-bits='64' id='type-id-712'/>
+    <pointer-type-def type-id='type-id-386' size-in-bits='64' id='type-id-608'/>
+    <pointer-type-def type-id='type-id-604' size-in-bits='64' id='type-id-613'/>
+    <reference-type-def kind='lvalue' type-id='type-id-613' size-in-bits='64' id='type-id-614'/>
+    <pointer-type-def type-id='type-id-603' size-in-bits='64' id='type-id-618'/>
+    <reference-type-def kind='lvalue' type-id='type-id-618' size-in-bits='64' id='type-id-619'/>
+    <reference-type-def kind='lvalue' type-id='type-id-605' size-in-bits='64' id='type-id-610'/>
+    <pointer-type-def type-id='type-id-411' size-in-bits='64' id='type-id-624'/>
+    <pointer-type-def type-id='type-id-622' size-in-bits='64' id='type-id-629'/>
+    <reference-type-def kind='lvalue' type-id='type-id-629' size-in-bits='64' id='type-id-630'/>
+    <pointer-type-def type-id='type-id-621' size-in-bits='64' id='type-id-634'/>
+    <reference-type-def kind='lvalue' type-id='type-id-634' size-in-bits='64' id='type-id-635'/>
+    <reference-type-def kind='lvalue' type-id='type-id-623' size-in-bits='64' id='type-id-626'/>
+    <pointer-type-def type-id='type-id-933' size-in-bits='64' id='type-id-695'/>
+    <pointer-type-def type-id='type-id-934' size-in-bits='64' id='type-id-707'/>
+    <pointer-type-def type-id='type-id-17' size-in-bits='64' id='type-id-643'/>
+    <pointer-type-def type-id='type-id-638' size-in-bits='64' id='type-id-647'/>
+    <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-656'/>
+    <pointer-type-def type-id='type-id-650' size-in-bits='64' id='type-id-659'/>
+    <pointer-type-def type-id='type-id-645' size-in-bits='64' id='type-id-646'/>
+    <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-660'/>
+    <pointer-type-def type-id='type-id-183' size-in-bits='64' id='type-id-665'/>
+    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-670'/>
+    <reference-type-def kind='lvalue' type-id='type-id-29' size-in-bits='64' id='type-id-725'/>
+    <pointer-type-def type-id='type-id-32' size-in-bits='64' id='type-id-719'/>
+    <pointer-type-def type-id='type-id-683' size-in-bits='64' id='type-id-688'/>
+    <reference-type-def kind='lvalue' type-id='type-id-636' size-in-bits='64' id='type-id-678'/>
+    <pointer-type-def type-id='type-id-636' size-in-bits='64' id='type-id-674'/>
+    <pointer-type-def type-id='type-id-607' size-in-bits='64' id='type-id-679'/>
+    <pointer-type-def type-id='type-id-935' size-in-bits='64' id='type-id-703'/>
+    <pointer-type-def type-id='type-id-936' size-in-bits='64' id='type-id-715'/>
+    <pointer-type-def type-id='type-id-937' size-in-bits='64' id='type-id-698'/>
+    <pointer-type-def type-id='type-id-938' size-in-bits='64' id='type-id-710'/>
+    <pointer-type-def type-id='type-id-939' size-in-bits='64' id='type-id-699'/>
+    <pointer-type-def type-id='type-id-940' size-in-bits='64' id='type-id-711'/>
     <pointer-type-def type-id='type-id-941' size-in-bits='64' id='type-id-696'/>
-    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-707'/>
+    <pointer-type-def type-id='type-id-942' size-in-bits='64' id='type-id-697'/>
     <pointer-type-def type-id='type-id-943' size-in-bits='64' id='type-id-708'/>
-    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-692'/>
-    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-704'/>
-    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-693'/>
-    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-705'/>
-    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-691'/>
-    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-703'/>
-    <reference-type-def kind='lvalue' type-id='type-id-87' size-in-bits='64' id='type-id-726'/>
-    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-700'/>
-    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-712'/>
-    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-701'/>
-    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-713'/>
+    <pointer-type-def type-id='type-id-944' size-in-bits='64' id='type-id-709'/>
+    <pointer-type-def type-id='type-id-21' size-in-bits='64' id='type-id-693'/>
+    <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-705'/>
+    <pointer-type-def type-id='type-id-19' size-in-bits='64' id='type-id-694'/>
+    <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-706'/>
+    <pointer-type-def type-id='type-id-945' size-in-bits='64' id='type-id-692'/>
+    <pointer-type-def type-id='type-id-946' size-in-bits='64' id='type-id-704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-87' size-in-bits='64' id='type-id-727'/>
+    <pointer-type-def type-id='type-id-947' size-in-bits='64' id='type-id-701'/>
+    <pointer-type-def type-id='type-id-948' size-in-bits='64' id='type-id-713'/>
+    <pointer-type-def type-id='type-id-949' size-in-bits='64' id='type-id-702'/>
+    <pointer-type-def type-id='type-id-950' size-in-bits='64' id='type-id-714'/>
     <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-636'>
+      <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-637'>
         <member-type access='public'>
-          <typedef-decl name='mask' type-id='type-id-507' 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-644'/>
+          <typedef-decl name='mask' type-id='type-id-507' 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-645'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='__to_type' type-id='type-id-950' 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-638'/>
+          <typedef-decl name='__to_type' type-id='type-id-951' 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-639'/>
         </member-type>
         <data-member access='public' static='yes'>
-          <var-decl name='upper' type-id='type-id-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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-915' 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-916' 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='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-776'/>
+      <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-777'/>
     </namespace-decl>
     <namespace-decl name='std'>
-      <class-decl name='random_access_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='104' column='1' id='type-id-783'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-951'/>
+      <class-decl name='random_access_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='104' column='1' id='type-id-784'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-952'/>
       </class-decl>
     </namespace-decl>
     <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-952'>
+      <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-953'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-36' 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-725'/>
+          <typedef-decl name='__type' type-id='type-id-36' 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-726'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <typedef-decl name='__gthread_mutex_t' type-id='type-id-953' 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/gthr-default.h' line='56' column='1' id='type-id-777'/>
-    <typedef-decl name='__gthread_once_t' type-id='type-id-954' 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/gthr-default.h' line='55' column='1' id='type-id-672'/>
+    <typedef-decl name='__gthread_mutex_t' type-id='type-id-954' 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/gthr-default.h' line='56' column='1' id='type-id-778'/>
+    <typedef-decl name='__gthread_once_t' type-id='type-id-955' 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/gthr-default.h' line='55' column='1' id='type-id-673'/>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_locale' type-id='type-id-955' 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-605'/>
+      <typedef-decl name='__c_locale' type-id='type-id-956' 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-606'/>
     </namespace-decl>
-    <array-type-def dimensions='1' type-id='type-id-502' size-in-bits='8192' id='type-id-652'>
-      <subrange length='256' type-id='type-id-515' id='type-id-791'/>
+    <array-type-def dimensions='1' type-id='type-id-502' size-in-bits='8192' id='type-id-653'>
+      <subrange length='256' type-id='type-id-515' id='type-id-792'/>
 
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='1024' id='type-id-654'>
-      <subrange length='16' type-id='type-id-515' id='type-id-956'/>
+    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='1024' id='type-id-655'>
+      <subrange length='16' type-id='type-id-515' id='type-id-957'/>
 
     </array-type-def>
-    <array-type-def dimensions='1' type-id='type-id-507' size-in-bits='256' id='type-id-653'>
-      <subrange length='16' type-id='type-id-515' id='type-id-956'/>
-
-    </array-type-def>
-    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-789'/>
-    <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='16' id='type-id-792'>
-      <subrange length='2' type-id='type-id-515' id='type-id-957'/>
+    <array-type-def dimensions='1' type-id='type-id-507' size-in-bits='256' id='type-id-654'>
+      <subrange length='16' type-id='type-id-515' id='type-id-957'/>
 
     </array-type-def>
+    <qualified-type-def type-id='type-id-219' const='yes' id='type-id-790'/>
     <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-930'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-931'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-959' filepath='/tmp/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-958'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-960' visibility='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-605' visibility='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-606' visibility='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-11' visibility='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'/>
@@ -18631,21 +18631,21 @@
         </member-function>
         <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-699' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <return type-id='type-id-4'/>
           </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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-960'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18653,8 +18653,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-699' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18725,14 +18725,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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-960'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18740,8 +18740,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-699' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18749,21 +18749,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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-699' is-artificial='yes'/>
+            <parameter type-id='type-id-700' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -18771,19 +18771,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-931'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-932'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-963' filepath='/tmp/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-962'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-964' visibility='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-605' visibility='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-606' visibility='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-11' visibility='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'/>
@@ -18800,21 +18800,21 @@
         </member-function>
         <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-711' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <return type-id='type-id-4'/>
           </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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18822,8 +18822,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-711' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18894,14 +18894,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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-964'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18909,8 +18909,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-711' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -18918,21 +18918,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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-711' is-artificial='yes'/>
+            <parameter type-id='type-id-712' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -18942,7 +18942,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-793'>
         <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-614'>
+          <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-615'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='ok' value='0'/>
             <enumerator name='partial' value='1'/>
@@ -18953,28 +18953,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-932'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-933'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-146' filepath='/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-966'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-605' 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-606' 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-694' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-694' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19024,36 +19024,36 @@
         </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-694' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-694' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-694' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-694' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-694' is-artificial='yes'/>
+            <parameter type-id='type-id-695' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19087,28 +19087,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-933'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-934'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-216' filepath='/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-968'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-605' 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-606' 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-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-706' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19158,36 +19158,36 @@
         </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-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-706' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-706' is-artificial='yes'/>
+            <parameter type-id='type-id-707' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19221,32 +19221,32 @@
       </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-934'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-935'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-146' filepath='/tmp/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-971'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-605' visibility='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-606' visibility='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-11' visibility='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-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-702' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -19302,15 +19302,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-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-702' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -19318,21 +19318,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-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-702' is-artificial='yes'/>
+            <parameter type-id='type-id-703' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19365,17 +19365,17 @@
       </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-935'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-936'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-970'/>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-216' filepath='/tmp/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-975'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-605' visibility='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-606' visibility='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-11' visibility='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'/>
@@ -19396,15 +19396,15 @@
         </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='1723' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-714' is-artificial='yes'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-714' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -19446,15 +19446,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-714' is-artificial='yes'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-714' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -19462,21 +19462,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-714' is-artificial='yes'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-714' is-artificial='yes'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-714' is-artificial='yes'/>
+            <parameter type-id='type-id-715' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19509,23 +19509,23 @@
       </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-936'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-937'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-15' filepath='/tmp/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-980'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-721' filepath='/tmp/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-981'/>
+          <typedef-decl name='iter_type' type-id='type-id-722' filepath='/tmp/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-981'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-146' filepath='/tmp/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-982'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-697' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19537,7 +19537,7 @@
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
             <return type-id='type-id-981'/>
           </function-decl>
@@ -19549,7 +19549,7 @@
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-984'/>
             <return type-id='type-id-981'/>
           </function-decl>
@@ -19560,9 +19560,9 @@
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <parameter type-id='type-id-726'/>
-            <return type-id='type-id-721'/>
+            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -19571,35 +19571,35 @@
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <parameter type-id='type-id-726'/>
-            <return type-id='type-id-721'/>
+            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-722'/>
           </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-697' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-697' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-697' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-697' is-artificial='yes'/>
+            <parameter type-id='type-id-698' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19611,9 +19611,9 @@
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -19623,31 +19623,31 @@
             <parameter type-id='type-id-981'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-984'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-937'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-938'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-105' filepath='/tmp/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-985'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-728' filepath='/tmp/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-986'/>
+          <typedef-decl name='iter_type' type-id='type-id-729' filepath='/tmp/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-986'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-216' filepath='/tmp/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-987'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19659,7 +19659,7 @@
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
             <return type-id='type-id-986'/>
           </function-decl>
@@ -19671,7 +19671,7 @@
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-989'/>
             <return type-id='type-id-986'/>
           </function-decl>
@@ -19682,9 +19682,9 @@
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <parameter type-id='type-id-726'/>
-            <return type-id='type-id-728'/>
+            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -19693,35 +19693,35 @@
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <parameter type-id='type-id-726'/>
-            <return type-id='type-id-728'/>
+            <parameter type-id='type-id-725'/>
+            <parameter type-id='type-id-727'/>
+            <return type-id='type-id-729'/>
           </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-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-709' is-artificial='yes'/>
+            <parameter type-id='type-id-710' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19733,9 +19733,9 @@
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-303'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -19745,31 +19745,31 @@
             <parameter type-id='type-id-986'/>
             <parameter type-id='type-id-23'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-989'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-938'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-939'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-15' filepath='/tmp/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-990'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-733' filepath='/tmp/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-991'/>
+          <typedef-decl name='iter_type' type-id='type-id-734' filepath='/tmp/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-991'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-146' filepath='/tmp/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-992'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19803,7 +19803,7 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-990'/>
             <parameter type-id='type-id-994'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -19813,33 +19813,33 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-990'/>
             <parameter type-id='type-id-994'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-698' is-artificial='yes'/>
+            <parameter type-id='type-id-699' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19852,7 +19852,7 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-990'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -19863,29 +19863,29 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-990'/>
             <parameter type-id='type-id-994'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-939'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-940'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-105' filepath='/tmp/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-995'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-736' filepath='/tmp/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-996'/>
+          <typedef-decl name='iter_type' type-id='type-id-737' filepath='/tmp/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-996'/>
         </member-type>
         <member-type access='private'>
           <typedef-decl name='string_type' type-id='type-id-216' filepath='/tmp/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-997'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-710' is-artificial='yes'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19919,7 +19919,7 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-995'/>
             <parameter type-id='type-id-999'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -19929,33 +19929,33 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-995'/>
             <parameter type-id='type-id-999'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-710' is-artificial='yes'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-710' is-artificial='yes'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-710' is-artificial='yes'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-710' is-artificial='yes'/>
+            <parameter type-id='type-id-711' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -19968,7 +19968,7 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-995'/>
             <parameter type-id='type-id-539'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
@@ -19979,14 +19979,14 @@
             <parameter type-id='type-id-102'/>
             <parameter type-id='type-id-995'/>
             <parameter type-id='type-id-999'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </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-940'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-941'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1000'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1002' filepath='/tmp/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-1001'/>
@@ -19998,7 +19998,7 @@
           <typedef-decl name='string_type' type-id='type-id-146' filepath='/tmp/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-1004'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-1005' visibility='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'/>
@@ -20008,7 +20008,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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-1005'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20016,16 +20016,16 @@
         </member-function>
         <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/include/bits/locale_facets_nonio.h' line='1302' 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-695' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </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='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-695' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20033,7 +20033,7 @@
         </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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20094,14 +20094,14 @@
         </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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-1005'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20109,8 +20109,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-695' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20118,21 +20118,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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-695' is-artificial='yes'/>
+            <parameter type-id='type-id-696' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20194,8 +20194,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-941'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-942'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1000'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1010' filepath='/tmp/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-1009'/>
@@ -20207,7 +20207,7 @@
           <typedef-decl name='string_type' type-id='type-id-146' filepath='/tmp/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-1012'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-1013' visibility='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'/>
@@ -20217,7 +20217,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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-1013'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20225,16 +20225,16 @@
         </member-function>
         <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/include/bits/locale_facets_nonio.h' line='1298' 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-696' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </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='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-696' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20242,7 +20242,7 @@
         </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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20303,14 +20303,14 @@
         </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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-1013'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20318,8 +20318,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-696' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20327,21 +20327,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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-696' is-artificial='yes'/>
+            <parameter type-id='type-id-697' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20403,8 +20403,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-942'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-943'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1000'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1016' filepath='/tmp/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-1015'/>
@@ -20416,7 +20416,7 @@
           <typedef-decl name='string_type' type-id='type-id-216' filepath='/tmp/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-1018'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-1019' visibility='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'/>
@@ -20426,7 +20426,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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-1019'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20434,16 +20434,16 @@
         </member-function>
         <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/include/bits/locale_facets_nonio.h' line='1318' 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-707' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </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='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-707' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20451,7 +20451,7 @@
         </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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20512,14 +20512,14 @@
         </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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-1019'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20527,8 +20527,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-707' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20536,21 +20536,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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-707' is-artificial='yes'/>
+            <parameter type-id='type-id-708' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20612,8 +20612,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-943'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-944'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1000'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1022' filepath='/tmp/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-1021'/>
@@ -20625,7 +20625,7 @@
           <typedef-decl name='string_type' type-id='type-id-216' filepath='/tmp/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-1024'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-1025' visibility='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'/>
@@ -20635,7 +20635,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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-1025'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20643,16 +20643,16 @@
         </member-function>
         <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/include/bits/locale_facets_nonio.h' line='1313' 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-708' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </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='991' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-708' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20660,7 +20660,7 @@
         </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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20721,14 +20721,14 @@
         </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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-1025'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20736,8 +20736,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-708' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20745,21 +20745,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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-708' is-artificial='yes'/>
+            <parameter type-id='type-id-709' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20821,8 +20821,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-944'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-945'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1028' filepath='/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-1027'/>
         </member-type>
@@ -20833,14 +20833,14 @@
           <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-1030'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-1031' visibility='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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-1031'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20848,15 +20848,15 @@
         </member-function>
         <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/include/bits/locale_facets.h' line='1863' 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-691' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <return type-id='type-id-4'/>
           </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='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-691' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20893,21 +20893,21 @@
         </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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-1031'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -20915,29 +20915,29 @@
         </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-691' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-691' is-artificial='yes'/>
+            <parameter type-id='type-id-692' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -20975,8 +20975,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-945'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-946'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='__cache_type' type-id='type-id-1034' filepath='/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-1033'/>
         </member-type>
@@ -20987,14 +20987,14 @@
           <typedef-decl name='char_type' type-id='type-id-105' filepath='/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-1036'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-1037' visibility='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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-1037'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -21002,15 +21002,15 @@
         </member-function>
         <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/include/bits/locale_facets.h' line='1871' 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-703' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <return type-id='type-id-4'/>
           </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='1695' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-703' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21047,21 +21047,21 @@
         </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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-1037'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -21069,29 +21069,29 @@
         </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-703' is-artificial='yes'/>
-            <parameter type-id='type-id-605'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
+            <parameter type-id='type-id-606'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-703' is-artificial='yes'/>
+            <parameter type-id='type-id-704' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21129,21 +21129,21 @@
       </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-946'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-947'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-15' filepath='/tmp/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-1040'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-721' filepath='/tmp/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-1041'/>
+          <typedef-decl name='iter_type' type-id='type-id-722' filepath='/tmp/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-1041'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21160,7 +21160,7 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1041'/>
           </function-decl>
@@ -21171,7 +21171,7 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1041'/>
           </function-decl>
@@ -21182,7 +21182,7 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1041'/>
           </function-decl>
@@ -21193,7 +21193,7 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1041'/>
           </function-decl>
@@ -21204,7 +21204,7 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1041'/>
           </function-decl>
@@ -21219,8 +21219,8 @@
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <return type-id='type-id-721'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -21232,8 +21232,8 @@
             <parameter type-id='type-id-529'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <return type-id='type-id-721'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -21245,8 +21245,8 @@
             <parameter type-id='type-id-529'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <return type-id='type-id-721'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -21255,36 +21255,36 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <parameter type-id='type-id-11'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-700' is-artificial='yes'/>
+            <parameter type-id='type-id-701' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21301,9 +21301,9 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -21312,9 +21312,9 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -21323,9 +21323,9 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
@@ -21334,9 +21334,9 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -21345,29 +21345,29 @@
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-1041'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-721'/>
+            <return type-id='type-id-722'/>
           </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-947'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-948'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-1039'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-105' filepath='/tmp/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-1045'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-728' filepath='/tmp/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-1046'/>
+          <typedef-decl name='iter_type' type-id='type-id-729' filepath='/tmp/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-1046'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-712' is-artificial='yes'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21384,7 +21384,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1046'/>
           </function-decl>
@@ -21395,7 +21395,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1046'/>
           </function-decl>
@@ -21406,7 +21406,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1046'/>
           </function-decl>
@@ -21417,7 +21417,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1046'/>
           </function-decl>
@@ -21428,7 +21428,7 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <return type-id='type-id-1046'/>
           </function-decl>
@@ -21443,8 +21443,8 @@
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <return type-id='type-id-728'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -21456,8 +21456,8 @@
             <parameter type-id='type-id-535'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <return type-id='type-id-728'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -21469,8 +21469,8 @@
             <parameter type-id='type-id-535'/>
             <parameter type-id='type-id-66'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
-            <return type-id='type-id-728'/>
+            <parameter type-id='type-id-725'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
@@ -21479,36 +21479,36 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
             <parameter type-id='type-id-249'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-712' is-artificial='yes'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-712' is-artificial='yes'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-712' is-artificial='yes'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-712' is-artificial='yes'/>
+            <parameter type-id='type-id-713' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21525,9 +21525,9 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='4'>
@@ -21536,9 +21536,9 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='5'>
@@ -21547,9 +21547,9 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
@@ -21558,9 +21558,9 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
@@ -21569,28 +21569,28 @@
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-1046'/>
             <parameter type-id='type-id-102'/>
-            <parameter type-id='type-id-724'/>
+            <parameter type-id='type-id-725'/>
             <parameter type-id='type-id-1044'/>
-            <return type-id='type-id-728'/>
+            <return type-id='type-id-729'/>
           </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-948'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-949'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-15' filepath='/tmp/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-1048'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-733' filepath='/tmp/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-1049'/>
+          <typedef-decl name='iter_type' type-id='type-id-734' filepath='/tmp/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-1049'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-701' is-artificial='yes'/>
+            <parameter type-id='type-id-702' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21604,7 +21604,7 @@
             <parameter type-id='type-id-534'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -21621,28 +21621,28 @@
         </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-701' is-artificial='yes'/>
+            <parameter type-id='type-id-702' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-701' is-artificial='yes'/>
+            <parameter type-id='type-id-702' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-701' is-artificial='yes'/>
+            <parameter type-id='type-id-702' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-701' is-artificial='yes'/>
+            <parameter type-id='type-id-702' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21656,26 +21656,26 @@
             <parameter type-id='type-id-534'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-733'/>
+            <return type-id='type-id-734'/>
           </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-949'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-950'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <member-type access='private'>
           <typedef-decl name='char_type' type-id='type-id-105' filepath='/tmp/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-1051'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iter_type' type-id='type-id-736' filepath='/tmp/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-1052'/>
+          <typedef-decl name='iter_type' type-id='type-id-737' filepath='/tmp/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-1052'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='id' type-id='type-id-606' 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-607' 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-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21689,7 +21689,7 @@
             <parameter type-id='type-id-534'/>
             <parameter type-id='type-id-249'/>
             <parameter type-id='type-id-249'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
@@ -21706,28 +21706,28 @@
         </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-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </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-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </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-713' is-artificial='yes'/>
+            <parameter type-id='type-id-714' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -21741,14 +21741,14 @@
             <parameter type-id='type-id-534'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-736'/>
+            <return type-id='type-id-737'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
     <pointer-type-def type-id='type-id-579' size-in-bits='64' id='type-id-903'/>
-    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-950'/>
-    <qualified-type-def type-id='type-id-382' const='yes' id='type-id-904'/>
+    <pointer-type-def type-id='type-id-496' size-in-bits='64' id='type-id-951'/>
+    <qualified-type-def type-id='type-id-382' const='yes' id='type-id-905'/>
     <pointer-type-def type-id='type-id-1054' size-in-bits='64' id='type-id-799'/>
     <pointer-type-def type-id='type-id-1055' size-in-bits='64' id='type-id-805'/>
     <reference-type-def kind='lvalue' type-id='type-id-805' size-in-bits='64' id='type-id-806'/>
@@ -21765,97 +21765,97 @@
     <pointer-type-def type-id='type-id-1063' size-in-bits='64' id='type-id-834'/>
     <pointer-type-def type-id='type-id-1064' size-in-bits='64' id='type-id-863'/>
     <pointer-type-def type-id='type-id-1065' size-in-bits='64' id='type-id-852'/>
-    <qualified-type-def type-id='type-id-386' const='yes' id='type-id-905'/>
-    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-906'/>
-    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-907'/>
-    <qualified-type-def type-id='type-id-411' const='yes' id='type-id-908'/>
-    <qualified-type-def type-id='type-id-621' const='yes' id='type-id-909'/>
-    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-910'/>
-    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-911'/>
-    <qualified-type-def type-id='type-id-637' const='yes' id='type-id-912'/>
-    <qualified-type-def type-id='type-id-107' const='yes' id='type-id-913'/>
-    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-914'/>
-    <qualified-type-def type-id='type-id-644' const='yes' id='type-id-915'/>
-    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-916'/>
+    <qualified-type-def type-id='type-id-386' const='yes' id='type-id-906'/>
+    <qualified-type-def type-id='type-id-604' const='yes' id='type-id-907'/>
+    <qualified-type-def type-id='type-id-603' const='yes' id='type-id-908'/>
+    <qualified-type-def type-id='type-id-411' const='yes' id='type-id-909'/>
+    <qualified-type-def type-id='type-id-622' const='yes' id='type-id-910'/>
+    <qualified-type-def type-id='type-id-621' const='yes' id='type-id-911'/>
+    <qualified-type-def type-id='type-id-17' const='yes' id='type-id-912'/>
+    <qualified-type-def type-id='type-id-638' const='yes' id='type-id-913'/>
+    <qualified-type-def type-id='type-id-107' const='yes' id='type-id-914'/>
+    <qualified-type-def type-id='type-id-650' const='yes' id='type-id-915'/>
+    <qualified-type-def type-id='type-id-645' const='yes' id='type-id-916'/>
+    <qualified-type-def type-id='type-id-86' const='yes' id='type-id-917'/>
     <reference-type-def kind='lvalue' type-id='type-id-1066' size-in-bits='64' id='type-id-867'/>
     <pointer-type-def type-id='type-id-1066' size-in-bits='64' id='type-id-865'/>
-    <qualified-type-def type-id='type-id-183' const='yes' id='type-id-917'/>
-    <qualified-type-def type-id='type-id-252' const='yes' id='type-id-918'/>
+    <qualified-type-def type-id='type-id-183' const='yes' id='type-id-918'/>
+    <qualified-type-def type-id='type-id-252' const='yes' id='type-id-919'/>
     <reference-type-def kind='lvalue' type-id='type-id-1067' size-in-bits='64' id='type-id-877'/>
     <pointer-type-def type-id='type-id-1067' size-in-bits='64' id='type-id-875'/>
     <reference-type-def kind='lvalue' type-id='type-id-1068' size-in-bits='64' id='type-id-887'/>
     <pointer-type-def type-id='type-id-1068' size-in-bits='64' id='type-id-885'/>
-    <qualified-type-def type-id='type-id-682' const='yes' id='type-id-919'/>
-    <qualified-type-def type-id='type-id-635' const='yes' id='type-id-920'/>
-    <qualified-type-def type-id='type-id-606' const='yes' id='type-id-921'/>
-    <qualified-type-def type-id='type-id-680' const='yes' id='type-id-922'/>
-    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-923'/>
-    <qualified-type-def type-id='type-id-111' const='yes' id='type-id-924'/>
-    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-925'/>
-    <qualified-type-def type-id='type-id-109' const='yes' id='type-id-926'/>
+    <qualified-type-def type-id='type-id-683' const='yes' id='type-id-920'/>
+    <qualified-type-def type-id='type-id-636' const='yes' id='type-id-921'/>
+    <qualified-type-def type-id='type-id-607' const='yes' id='type-id-922'/>
+    <qualified-type-def type-id='type-id-681' const='yes' id='type-id-923'/>
+    <qualified-type-def type-id='type-id-21' const='yes' id='type-id-924'/>
+    <qualified-type-def type-id='type-id-111' const='yes' id='type-id-925'/>
+    <qualified-type-def type-id='type-id-19' const='yes' id='type-id-926'/>
+    <qualified-type-def type-id='type-id-109' const='yes' id='type-id-927'/>
     <pointer-type-def type-id='type-id-1069' size-in-bits='64' id='type-id-895'/>
     <pointer-type-def type-id='type-id-1070' size-in-bits='64' id='type-id-902'/>
-    <pointer-type-def type-id='type-id-601' size-in-bits='64' id='type-id-798'/>
+    <pointer-type-def type-id='type-id-602' size-in-bits='64' id='type-id-798'/>
     <pointer-type-def type-id='type-id-796' size-in-bits='64' 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-795' size-in-bits='64' id='type-id-807'/>
     <reference-type-def kind='lvalue' type-id='type-id-807' size-in-bits='64' id='type-id-808'/>
     <reference-type-def kind='lvalue' type-id='type-id-797' size-in-bits='64' id='type-id-800'/>
-    <pointer-type-def type-id='type-id-619' size-in-bits='64' id='type-id-812'/>
+    <pointer-type-def type-id='type-id-620' size-in-bits='64' id='type-id-812'/>
     <pointer-type-def type-id='type-id-810' size-in-bits='64' id='type-id-817'/>
     <reference-type-def kind='lvalue' type-id='type-id-817' size-in-bits='64' id='type-id-818'/>
     <pointer-type-def type-id='type-id-809' size-in-bits='64' id='type-id-821'/>
     <reference-type-def kind='lvalue' type-id='type-id-821' size-in-bits='64' id='type-id-822'/>
     <reference-type-def kind='lvalue' type-id='type-id-811' size-in-bits='64' id='type-id-814'/>
-    <pointer-type-def type-id='type-id-648' size-in-bits='64' id='type-id-825'/>
+    <pointer-type-def type-id='type-id-649' size-in-bits='64' id='type-id-825'/>
     <pointer-type-def type-id='type-id-823' size-in-bits='64' id='type-id-826'/>
-    <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-927'/>
-    <reference-type-def kind='lvalue' type-id='type-id-336' size-in-bits='64' id='type-id-928'/>
+    <reference-type-def kind='lvalue' type-id='type-id-297' size-in-bits='64' id='type-id-928'/>
+    <reference-type-def kind='lvalue' type-id='type-id-336' size-in-bits='64' id='type-id-929'/>
     <qualified-type-def type-id='type-id-833' id='type-id-831'/>
-    <reference-type-def kind='lvalue' type-id='type-id-773' size-in-bits='64' id='type-id-833'/>
+    <reference-type-def kind='lvalue' type-id='type-id-774' size-in-bits='64' id='type-id-833'/>
     <pointer-type-def type-id='type-id-1071' size-in-bits='64' id='type-id-844'/>
     <reference-type-def kind='lvalue' type-id='type-id-828' size-in-bits='64' id='type-id-841'/>
     <pointer-type-def type-id='type-id-1072' size-in-bits='64' id='type-id-843'/>
     <pointer-type-def type-id='type-id-829' size-in-bits='64' id='type-id-842'/>
     <pointer-type-def type-id='type-id-830' size-in-bits='64' id='type-id-832'/>
     <qualified-type-def type-id='type-id-851' id='type-id-849'/>
-    <reference-type-def kind='lvalue' type-id='type-id-774' size-in-bits='64' id='type-id-851'/>
+    <reference-type-def kind='lvalue' type-id='type-id-775' size-in-bits='64' id='type-id-851'/>
     <pointer-type-def type-id='type-id-1073' size-in-bits='64' id='type-id-862'/>
     <reference-type-def kind='lvalue' type-id='type-id-846' size-in-bits='64' id='type-id-859'/>
     <pointer-type-def type-id='type-id-1074' size-in-bits='64' id='type-id-861'/>
     <pointer-type-def type-id='type-id-847' size-in-bits='64' id='type-id-860'/>
     <pointer-type-def type-id='type-id-848' size-in-bits='64' id='type-id-850'/>
-    <reference-type-def kind='lvalue' type-id='type-id-787' size-in-bits='64' id='type-id-866'/>
-    <pointer-type-def type-id='type-id-787' size-in-bits='64' id='type-id-864'/>
-    <reference-type-def kind='lvalue' type-id='type-id-721' size-in-bits='64' id='type-id-876'/>
-    <pointer-type-def type-id='type-id-721' size-in-bits='64' id='type-id-873'/>
+    <reference-type-def kind='lvalue' type-id='type-id-788' size-in-bits='64' id='type-id-866'/>
+    <pointer-type-def type-id='type-id-788' size-in-bits='64' id='type-id-864'/>
+    <reference-type-def kind='lvalue' type-id='type-id-722' size-in-bits='64' id='type-id-876'/>
+    <pointer-type-def type-id='type-id-722' size-in-bits='64' id='type-id-873'/>
     <reference-type-def kind='lvalue' type-id='type-id-871' size-in-bits='64' id='type-id-874'/>
     <pointer-type-def type-id='type-id-868' size-in-bits='64' id='type-id-872'/>
-    <reference-type-def kind='lvalue' type-id='type-id-728' size-in-bits='64' id='type-id-886'/>
-    <pointer-type-def type-id='type-id-728' size-in-bits='64' id='type-id-883'/>
+    <reference-type-def kind='lvalue' type-id='type-id-729' size-in-bits='64' id='type-id-886'/>
+    <pointer-type-def type-id='type-id-729' size-in-bits='64' id='type-id-883'/>
     <reference-type-def kind='lvalue' type-id='type-id-881' size-in-bits='64' id='type-id-884'/>
     <pointer-type-def type-id='type-id-878' size-in-bits='64' id='type-id-882'/>
-    <reference-type-def kind='lvalue' type-id='type-id-733' size-in-bits='64' id='type-id-894'/>
-    <pointer-type-def type-id='type-id-733' size-in-bits='64' id='type-id-892'/>
+    <reference-type-def kind='lvalue' type-id='type-id-734' size-in-bits='64' id='type-id-894'/>
+    <pointer-type-def type-id='type-id-734' size-in-bits='64' id='type-id-892'/>
     <reference-type-def kind='lvalue' type-id='type-id-890' size-in-bits='64' id='type-id-893'/>
     <pointer-type-def type-id='type-id-889' size-in-bits='64' id='type-id-891'/>
-    <reference-type-def kind='lvalue' type-id='type-id-736' size-in-bits='64' id='type-id-901'/>
-    <pointer-type-def type-id='type-id-736' size-in-bits='64' id='type-id-899'/>
+    <reference-type-def kind='lvalue' type-id='type-id-737' size-in-bits='64' id='type-id-901'/>
+    <pointer-type-def type-id='type-id-737' size-in-bits='64' id='type-id-899'/>
     <reference-type-def kind='lvalue' type-id='type-id-897' size-in-bits='64' id='type-id-900'/>
     <pointer-type-def type-id='type-id-896' size-in-bits='64' id='type-id-898'/>
     <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-951'>
+      <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-952'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-185'/>
       </class-decl>
     </namespace-decl>
     <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-888'/>
     </namespace-decl>
-    <typedef-decl name='__locale_t' type-id='type-id-1075' filepath='/usr/include/xlocale.h' line='40' column='1' id='type-id-955'/>
-    <typedef-decl name='pthread_mutex_t' type-id='type-id-1076' filepath='/usr/include/bits/pthreadtypes.h' line='104' column='1' id='type-id-953'/>
-    <typedef-decl name='pthread_once_t' type-id='type-id-36' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-954'/>
+    <typedef-decl name='__locale_t' type-id='type-id-1075' filepath='/usr/include/xlocale.h' line='40' column='1' id='type-id-956'/>
+    <typedef-decl name='pthread_mutex_t' type-id='type-id-1076' filepath='/usr/include/bits/pthreadtypes.h' line='104' column='1' id='type-id-954'/>
+    <typedef-decl name='pthread_once_t' type-id='type-id-36' filepath='/usr/include/bits/pthreadtypes.h' line='144' column='1' id='type-id-955'/>
     <namespace-decl name='std'>
-      <typedef-decl name='__c_file' 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/x86_64-unknown-linux-gnu/bits/c++io.h' line='46' column='1' id='type-id-929'/>
+      <typedef-decl name='__c_file' 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/x86_64-unknown-linux-gnu/bits/c++io.h' line='46' column='1' id='type-id-930'/>
     </namespace-decl>
     <pointer-type-def type-id='type-id-1077' size-in-bits='64' id='type-id-1075'/>
     <namespace-decl name='std'>
@@ -21924,13 +21924,13 @@
       </class-decl>
     </namespace-decl>
     <qualified-type-def type-id='type-id-23' const='yes' id='type-id-1006'/>
-    <qualified-type-def type-id='type-id-601' const='yes' id='type-id-1054'/>
+    <qualified-type-def type-id='type-id-602' const='yes' id='type-id-1054'/>
     <qualified-type-def type-id='type-id-796' const='yes' id='type-id-1055'/>
     <qualified-type-def type-id='type-id-795' const='yes' id='type-id-1056'/>
-    <qualified-type-def type-id='type-id-619' const='yes' id='type-id-1057'/>
+    <qualified-type-def type-id='type-id-620' const='yes' id='type-id-1057'/>
     <qualified-type-def type-id='type-id-810' const='yes' id='type-id-1058'/>
     <qualified-type-def type-id='type-id-809' const='yes' id='type-id-1059'/>
-    <qualified-type-def type-id='type-id-648' const='yes' id='type-id-1060'/>
+    <qualified-type-def type-id='type-id-649' const='yes' id='type-id-1060'/>
     <qualified-type-def type-id='type-id-823' const='yes' id='type-id-1061'/>
     <pointer-type-def type-id='type-id-1081' size-in-bits='64' id='type-id-961'/>
     <pointer-type-def type-id='type-id-1082' size-in-bits='64' id='type-id-965'/>
@@ -21940,9 +21940,9 @@
     <qualified-type-def type-id='type-id-848' const='yes' id='type-id-1065'/>
     <pointer-type-def type-id='type-id-1083' size-in-bits='64' id='type-id-967'/>
     <pointer-type-def type-id='type-id-1084' size-in-bits='64' id='type-id-969'/>
-    <qualified-type-def type-id='type-id-787' const='yes' id='type-id-1066'/>
-    <qualified-type-def type-id='type-id-721' const='yes' id='type-id-1067'/>
-    <qualified-type-def type-id='type-id-728' const='yes' id='type-id-1068'/>
+    <qualified-type-def type-id='type-id-788' const='yes' id='type-id-1066'/>
+    <qualified-type-def type-id='type-id-722' const='yes' id='type-id-1067'/>
+    <qualified-type-def type-id='type-id-729' const='yes' id='type-id-1068'/>
     <pointer-type-def type-id='type-id-1085' size-in-bits='64' id='type-id-972'/>
     <reference-type-def kind='lvalue' type-id='type-id-1086' size-in-bits='64' id='type-id-974'/>
     <pointer-type-def type-id='type-id-1087' size-in-bits='64' id='type-id-976'/>
@@ -21959,8 +21959,8 @@
     <pointer-type-def type-id='type-id-1098' size-in-bits='64' id='type-id-1026'/>
     <pointer-type-def type-id='type-id-1099' size-in-bits='64' id='type-id-1032'/>
     <pointer-type-def type-id='type-id-1100' size-in-bits='64' id='type-id-1038'/>
-    <qualified-type-def type-id='type-id-733' const='yes' id='type-id-1069'/>
-    <qualified-type-def type-id='type-id-736' const='yes' id='type-id-1070'/>
+    <qualified-type-def type-id='type-id-734' const='yes' id='type-id-1069'/>
+    <qualified-type-def type-id='type-id-737' const='yes' id='type-id-1070'/>
     <pointer-type-def type-id='type-id-1101' size-in-bits='64' id='type-id-1042'/>
     <pointer-type-def type-id='type-id-1102' size-in-bits='64' id='type-id-1047'/>
     <pointer-type-def type-id='type-id-1103' size-in-bits='64' id='type-id-1050'/>
@@ -21994,7 +21994,7 @@
     <pointer-type-def type-id='type-id-1033' size-in-bits='64' id='type-id-1037'/>
     <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-1002'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-11' visibility='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>
@@ -22103,7 +22103,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-1010'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-11' visibility='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>
@@ -22212,7 +22212,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-1016'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-11' visibility='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>
@@ -22321,7 +22321,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-1022'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-11' visibility='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>
@@ -22430,7 +22430,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-1028'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-11' visibility='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>
@@ -22527,7 +22527,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-1034'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' layout-offset-in-bits='128'>
           <var-decl name='_M_grouping' type-id='type-id-11' visibility='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>
@@ -22624,7 +22624,7 @@
     </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-959'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' static='yes'>
           <var-decl name='_S_timezones' type-id='type-id-1132' 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>
@@ -22832,7 +22832,7 @@
     </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-963'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
         <data-member access='public' static='yes'>
           <var-decl name='_S_timezones' type-id='type-id-1136' 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>
@@ -23111,33 +23111,33 @@
     <reference-type-def kind='lvalue' type-id='type-id-1151' size-in-bits='64' id='type-id-1120'/>
     <reference-type-def kind='lvalue' type-id='type-id-1152' size-in-bits='64' id='type-id-1125'/>
     <reference-type-def kind='lvalue' type-id='type-id-1153' size-in-bits='64' id='type-id-1130'/>
-    <qualified-type-def type-id='type-id-930' const='yes' id='type-id-1081'/>
-    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1082'/>
+    <qualified-type-def type-id='type-id-931' const='yes' id='type-id-1081'/>
+    <qualified-type-def type-id='type-id-932' const='yes' id='type-id-1082'/>
     <reference-type-def kind='lvalue' type-id='type-id-1154' size-in-bits='64' id='type-id-1134'/>
     <reference-type-def kind='lvalue' type-id='type-id-1155' size-in-bits='64' id='type-id-1138'/>
-    <qualified-type-def type-id='type-id-932' const='yes' id='type-id-1083'/>
-    <qualified-type-def type-id='type-id-933' const='yes' id='type-id-1084'/>
-    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1085'/>
+    <qualified-type-def type-id='type-id-933' const='yes' id='type-id-1083'/>
+    <qualified-type-def type-id='type-id-934' const='yes' id='type-id-1084'/>
+    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1085'/>
     <qualified-type-def type-id='type-id-971' const='yes' id='type-id-1086'/>
-    <qualified-type-def type-id='type-id-935' const='yes' id='type-id-1087'/>
+    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1087'/>
     <qualified-type-def type-id='type-id-975' const='yes' id='type-id-1088'/>
     <qualified-type-def type-id='type-id-1008' const='yes' id='type-id-1080'/>
-    <qualified-type-def type-id='type-id-936' const='yes' id='type-id-1089'/>
-    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1090'/>
-    <qualified-type-def type-id='type-id-938' const='yes' id='type-id-1091'/>
+    <qualified-type-def type-id='type-id-937' const='yes' id='type-id-1089'/>
+    <qualified-type-def type-id='type-id-938' const='yes' id='type-id-1090'/>
+    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1091'/>
     <qualified-type-def type-id='type-id-992' const='yes' id='type-id-1092'/>
-    <qualified-type-def type-id='type-id-939' const='yes' id='type-id-1093'/>
+    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1093'/>
     <qualified-type-def type-id='type-id-997' const='yes' id='type-id-1094'/>
-    <qualified-type-def type-id='type-id-940' const='yes' id='type-id-1095'/>
-    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1096'/>
-    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-1097'/>
-    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1098'/>
-    <qualified-type-def type-id='type-id-944' const='yes' id='type-id-1099'/>
-    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-1100'/>
-    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1101'/>
-    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1102'/>
-    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1103'/>
-    <qualified-type-def type-id='type-id-949' const='yes' id='type-id-1104'/>
+    <qualified-type-def type-id='type-id-941' const='yes' id='type-id-1095'/>
+    <qualified-type-def type-id='type-id-942' const='yes' id='type-id-1096'/>
+    <qualified-type-def type-id='type-id-943' const='yes' id='type-id-1097'/>
+    <qualified-type-def type-id='type-id-944' const='yes' id='type-id-1098'/>
+    <qualified-type-def type-id='type-id-945' const='yes' id='type-id-1099'/>
+    <qualified-type-def type-id='type-id-946' const='yes' id='type-id-1100'/>
+    <qualified-type-def type-id='type-id-947' const='yes' id='type-id-1101'/>
+    <qualified-type-def type-id='type-id-948' const='yes' id='type-id-1102'/>
+    <qualified-type-def type-id='type-id-949' const='yes' id='type-id-1103'/>
+    <qualified-type-def type-id='type-id-950' const='yes' id='type-id-1104'/>
     <qualified-type-def type-id='type-id-979' const='yes' id='type-id-1105'/>
     <array-type-def dimensions='1' type-id='type-id-249' size-in-bits='896' id='type-id-1136'>
       <subrange length='14' type-id='type-id-515' id='type-id-1147'/>
@@ -23169,10 +23169,10 @@
         <var-decl name='__ctype_b' type-id='type-id-1157' 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-950' visibility='default' filepath='/usr/include/xlocale.h' line='35' column='1'/>
+        <var-decl name='__ctype_tolower' type-id='type-id-951' 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-950' visibility='default' filepath='/usr/include/xlocale.h' line='36' column='1'/>
+        <var-decl name='__ctype_toupper' type-id='type-id-951' 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-1158' visibility='default' filepath='/usr/include/xlocale.h' line='39' column='1'/>
@@ -23520,7 +23520,7 @@
         <parameter type-id='type-id-66'/>
         <return type-id='type-id-66'/>
       </function-decl>
-      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-782'>
+      <class-decl name='iterator_traits&lt;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='176' column='1' id='type-id-783'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='180' column='1' id='type-id-442'/>
         </member-type>
@@ -23531,10 +23531,10 @@
           <typedef-decl name='reference' type-id='type-id-187' 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='182' column='1' id='type-id-444'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-783' 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='178' column='1' id='type-id-448'/>
+          <typedef-decl name='iterator_category' type-id='type-id-784' 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='178' column='1' id='type-id-448'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-786'>
+      <class-decl name='iterator_traits&lt;wchar_t*&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='176' column='1' id='type-id-787'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='180' column='1' id='type-id-473'/>
         </member-type>
@@ -23545,7 +23545,7 @@
           <typedef-decl name='reference' type-id='type-id-254' 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='182' column='1' id='type-id-475'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-783' 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='178' column='1' id='type-id-479'/>
+          <typedef-decl name='iterator_category' type-id='type-id-784' 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='178' column='1' id='type-id-479'/>
         </member-type>
       </class-decl>
       <class-decl name='_Hash_impl' 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/functional_hash.h' line='131' column='1' id='type-id-1184'>
@@ -23695,34 +23695,34 @@
       <class-decl name='exception' size-in-bits='64' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='62' column='1' is-declaration-only='yes' id='type-id-86'>
         <member-function access='private' constructor='yes'>
           <function-decl name='exception' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/libstdc++-v3/libsupc++/exception' line='65' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' mangled-name='_ZNSt9exceptionD0Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~exception' mangled-name='_ZNSt9exceptionD2Ev' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt9exceptionD1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-659' is-artificial='yes'/>
+            <parameter type-id='type-id-660' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt9exception4whatEv' filepath='../../.././libstdc++-v3/libsupc++/eh_exception.cc' line='40' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt9exception4whatEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-660' is-artificial='yes'/>
+            <parameter type-id='type-id-661' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -24032,18 +24032,18 @@
     </function-decl>
     <function-decl name='strtod' filepath='/usr/include/stdlib.h' line='165' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <return type-id='type-id-536'/>
     </function-decl>
     <function-decl name='strtol' filepath='/usr/include/stdlib.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-55'/>
     </function-decl>
     <function-decl name='strtoul' filepath='/usr/include/stdlib.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-69'/>
     </function-decl>
@@ -24073,24 +24073,24 @@
     </function-decl>
     <function-decl name='strtoll' filepath='/usr/include/stdlib.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-540'/>
     </function-decl>
     <function-decl name='strtoull' filepath='/usr/include/stdlib.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <parameter type-id='type-id-36'/>
       <return type-id='type-id-541'/>
     </function-decl>
     <function-decl name='strtof' filepath='/usr/include/stdlib.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <return type-id='type-id-538'/>
     </function-decl>
     <function-decl name='strtold' filepath='/usr/include/stdlib.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
+      <parameter type-id='type-id-685'/>
       <return type-id='type-id-539'/>
     </function-decl>
     <reference-type-def kind='lvalue' type-id='type-id-496' size-in-bits='64' id='type-id-1185'/>
@@ -24659,7 +24659,7 @@
       </class-decl>
       <class-decl name='__mutex_base' 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/mutex' line='57' column='1' id='type-id-1283'>
         <member-type access='protected'>
-          <typedef-decl name='__native_type' type-id='type-id-777' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='60' column='1' id='type-id-1289'/>
+          <typedef-decl name='__native_type' type-id='type-id-778' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='60' column='1' id='type-id-1289'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
           <var-decl name='_M_mutex' type-id='type-id-1289' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='63' column='1'/>
@@ -26011,7 +26011,7 @@
       </function-decl>
       <class-decl name='once_flag' 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/mutex' line='762' column='1' id='type-id-1437'>
         <member-type access='private'>
-          <typedef-decl name='__native_type' type-id='type-id-672' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='765' column='1' id='type-id-1438'/>
+          <typedef-decl name='__native_type' type-id='type-id-673' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='765' column='1' id='type-id-1438'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_once' type-id='type-id-1438' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/mutex' line='766' column='1'/>
@@ -27322,10 +27322,10 @@
           <typedef-decl name='_Manager_type' type-id='type-id-1596' 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-1595'/>
         </member-type>
         <data-member access='private' static='yes'>
-          <var-decl name='_M_max_size' type-id='type-id-641' 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-642' 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-641' 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-642' 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-1597' 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'/>
@@ -28294,7 +28294,7 @@
     <reference-type-def kind='lvalue' type-id='type-id-1639' size-in-bits='64' id='type-id-1647'/>
     <pointer-type-def type-id='type-id-1639' size-in-bits='64' id='type-id-1640'/>
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='128' id='type-id-1691'>
-      <subrange length='16' type-id='type-id-515' id='type-id-956'/>
+      <subrange length='16' type-id='type-id-515' id='type-id-957'/>
 
     </array-type-def>
     <namespace-decl name='std'>
@@ -29269,7 +29269,7 @@
       </class-decl>
       <class-decl name='__mutex' 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/ext/concurrence.h' line='143' column='1' id='type-id-1790'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_mutex' type-id='type-id-777' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='147' column='1'/>
+          <var-decl name='_M_mutex' type-id='type-id-778' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='147' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='__mutex' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/concurrence.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -29558,7 +29558,7 @@
     <qualified-type-def type-id='type-id-1790' const='yes' id='type-id-1822'/>
     <reference-type-def kind='lvalue' type-id='type-id-1822' size-in-bits='64' id='type-id-1792'/>
     <reference-type-def kind='lvalue' type-id='type-id-1790' size-in-bits='64' id='type-id-1793'/>
-    <pointer-type-def type-id='type-id-777' size-in-bits='64' id='type-id-1794'/>
+    <pointer-type-def type-id='type-id-778' size-in-bits='64' id='type-id-1794'/>
     <reference-type-def kind='lvalue' type-id='type-id-1796' size-in-bits='64' id='type-id-1801'/>
     <qualified-type-def type-id='type-id-1801' id='type-id-1797'/>
     <pointer-type-def type-id='type-id-1795' size-in-bits='64' id='type-id-1798'/>
@@ -32242,12 +32242,12 @@
     <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-1924'/>
 
     <array-type-def dimensions='1' type-id='type-id-15' size-in-bits='64' id='type-id-2019'>
-      <subrange length='8' type-id='type-id-515' id='type-id-595'/>
+      <subrange length='8' type-id='type-id-515' id='type-id-596'/>
 
     </array-type-def>
     <qualified-type-def type-id='type-id-1977' const='yes' id='type-id-2056'/>
     <pointer-type-def type-id='type-id-2056' size-in-bits='64' id='type-id-2034'/>
-    <pointer-type-def type-id='type-id-641' size-in-bits='64' id='type-id-2035'/>
+    <pointer-type-def type-id='type-id-642' size-in-bits='64' id='type-id-2035'/>
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-2057'/>
     <pointer-type-def type-id='type-id-2057' size-in-bits='64' id='type-id-1927'/>
     <reference-type-def kind='lvalue' type-id='type-id-2057' size-in-bits='64' id='type-id-1929'/>
@@ -32655,11 +32655,11 @@
 
     <pointer-type-def type-id='type-id-2095' size-in-bits='64' id='type-id-2096'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2096' size-in-bits='1024' id='type-id-2118'>
-      <subrange length='16' type-id='type-id-515' id='type-id-956'/>
+    <array-type-def dimensions='1' type-id='type-id-2118' size-in-bits='1024' id='type-id-2097'>
+      <subrange length='16' type-id='type-id-515' id='type-id-957'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-2118' volatile='yes' id='type-id-2097'/>
+    <qualified-type-def type-id='type-id-2096' volatile='yes' id='type-id-2118'/>
     <pointer-type-def type-id='type-id-2091' size-in-bits='64' id='type-id-2098'/>
     <qualified-type-def type-id='type-id-2096' volatile='yes' id='type-id-2119'/>
     <pointer-type-def type-id='type-id-2119' size-in-bits='64' id='type-id-2099'/>
@@ -33387,7 +33387,7 @@
     <namespace-decl name='std'>
 
       <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-656'/>
+        <parameter type-id='type-id-657'/>
         <return type-id='type-id-2197'/>
       </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'>
@@ -33412,7 +33412,7 @@
       <function-decl name='__distance&lt;char*&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='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-149'/>
         <parameter type-id='type-id-149'/>
-        <parameter type-id='type-id-783'/>
+        <parameter type-id='type-id-784'/>
         <return type-id='type-id-442'/>
       </function-decl>
       <function-decl name='distance&lt;char*&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'>
@@ -33427,7 +33427,7 @@
       <function-decl name='__distance&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/stl_iterator_base_funcs.h' line='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-219'/>
         <parameter type-id='type-id-219'/>
-        <parameter type-id='type-id-783'/>
+        <parameter type-id='type-id-784'/>
         <return type-id='type-id-473'/>
       </function-decl>
       <function-decl name='distance&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/stl_iterator_base_funcs.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -34049,7 +34049,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-2238'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-773'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-774'/>
         <member-type access='private'>
           <typedef-decl name='__string_type' type-id='type-id-146' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='387' column='1' id='type-id-2239'/>
         </member-type>
@@ -34324,7 +34324,7 @@
         </member-function>
       </class-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-2258'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-774'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-775'/>
         <member-type access='private'>
           <typedef-decl name='__string_type' type-id='type-id-216' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='387' column='1' id='type-id-2259'/>
         </member-type>
@@ -34454,7 +34454,7 @@
         <return type-id='type-id-851'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-913' size-in-bits='64' id='type-id-2197'/>
+    <reference-type-def kind='lvalue' type-id='type-id-914' size-in-bits='64' id='type-id-2197'/>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;char&gt;' 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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-149'/>
@@ -34619,7 +34619,7 @@
         <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-2290' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -34639,7 +34639,7 @@
         <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-2290' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -34750,7 +34750,7 @@
       <subrange length='272' type-id='type-id-515' id='type-id-2300'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-597' const='yes' id='type-id-2289'/>
+    <qualified-type-def type-id='type-id-598' const='yes' id='type-id-2289'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <namespace-decl name='std'>
@@ -34853,11 +34853,11 @@
       </namespace-decl>
     </namespace-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='19520' id='type-id-2323'>
+    <array-type-def dimensions='1' type-id='type-id-2323' size-in-bits='19520' id='type-id-2322'>
       <subrange length='305' type-id='type-id-515' id='type-id-2324'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-2323' const='yes' id='type-id-2322'/>
+    <qualified-type-def type-id='type-id-69' const='yes' id='type-id-2323'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <namespace-decl name='std'>
@@ -35009,7 +35009,7 @@
         <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-2335' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -35042,7 +35042,7 @@
         <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-2335' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -35273,7 +35273,7 @@
         <return type-id='type-id-441'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-739' size-in-bits='64' id='type-id-2343'/>
+    <reference-type-def kind='lvalue' type-id='type-id-740' size-in-bits='64' id='type-id-2343'/>
 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/math_stubs_float.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'>
@@ -35946,7 +35946,7 @@
       </class-decl>
       <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-2374'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
-        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-773'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-774'/>
         <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-2375' is-artificial='yes'/>
@@ -36152,7 +36152,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-2379'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-773'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-774'/>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_buf' type-id='type-id-2366' 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>
@@ -36601,7 +36601,7 @@
     <qualified-type-def type-id='type-id-294' const='yes' id='type-id-2401'/>
 
     <qualified-type-def type-id='type-id-333' const='yes' id='type-id-2402'/>
-    <reference-type-def kind='lvalue' type-id='type-id-911' size-in-bits='64' id='type-id-2400'/>
+    <reference-type-def kind='lvalue' type-id='type-id-912' size-in-bits='64' id='type-id-2400'/>
 
 
   </abi-instr>
@@ -37126,10 +37126,10 @@
       <class-decl name='_Expr&lt;std::_UnClos&lt;std::__logical_not, std::_ValArray, long unsigned int&gt;, bool&gt;' visibility='default' is-declaration-only='yes' id='type-id-2416'/>
       <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-2427'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sz' type-id='type-id-641' 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-642' 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-641' 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-642' 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-2439' 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'/>
@@ -37453,7 +37453,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-2432'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sz' type-id='type-id-641' 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-642' 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-2453' 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'/>
@@ -38187,7 +38187,7 @@
       <class-decl name='_Expr&lt;std::_RefFunClos&lt;std::_ValArray, bool&gt;, bool&gt;' visibility='default' is-declaration-only='yes' id='type-id-2494'/>
       <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-2434'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sz' type-id='type-id-641' 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-642' 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-2439' 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'/>
@@ -38483,8 +38483,8 @@
       <return type-id='type-id-512'/>
     </function-decl>
     <function-decl name='__uselocale' 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='52' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-955'/>
-      <return type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
+      <return type-id='type-id-956'/>
     </function-decl>
     <function-decl name='mbsnrtowcs' filepath='/usr/include/wchar.h' line='421' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-219'/>
@@ -38505,27 +38505,27 @@
     <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-11'/>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='__strxfrm_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='48' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-149'/>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-512'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-512'/>
     </function-decl>
     <function-decl name='__wcscoll_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='58' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-249'/>
       <parameter type-id='type-id-249'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='__wcsxfrm_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='60' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-219'/>
       <parameter type-id='type-id-249'/>
       <parameter type-id='type-id-512'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-512'/>
     </function-decl>
   </abi-instr>
@@ -38583,23 +38583,23 @@
     <pointer-type-def type-id='type-id-2525' size-in-bits='64' id='type-id-2526'/>
     <function-decl name='__wctype_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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-544'/>
     </function-decl>
     <function-decl name='__towupper_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='57' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-138'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-138'/>
     </function-decl>
     <function-decl name='__towlower_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='56' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-138'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-138'/>
     </function-decl>
     <function-decl name='__iswctype_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='55' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-138'/>
       <parameter type-id='type-id-544'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-36'/>
     </function-decl>
     <function-decl name='__wctob_alias' mangled-name='wctob' filepath='/usr/include/wchar.h' line='390' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38629,7 +38629,7 @@
     <typedef-decl name='nl_item' type-id='type-id-36' filepath='/usr/include/nl_types.h' line='37' column='1' id='type-id-2527'/>
     <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-2527'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-149'/>
     </function-decl>
   </abi-instr>
@@ -38647,7 +38647,7 @@
       <parameter type-id='type-id-512'/>
       <parameter type-id='type-id-11'/>
       <parameter type-id='type-id-534'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-512'/>
     </function-decl>
     <function-decl name='__wcsftime_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='59' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -38655,7 +38655,7 @@
       <parameter type-id='type-id-512'/>
       <parameter type-id='type-id-249'/>
       <parameter type-id='type-id-534'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-512'/>
     </function-decl>
   </abi-instr>
@@ -38894,21 +38894,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-11'/>
         <parameter type-id='type-id-301'/>
-        <parameter type-id='type-id-724'/>
+        <parameter type-id='type-id-725'/>
         <parameter type-id='type-id-2548'/>
         <return type-id='type-id-4'/>
       </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-11'/>
         <parameter type-id='type-id-302'/>
-        <parameter type-id='type-id-724'/>
+        <parameter type-id='type-id-725'/>
         <parameter type-id='type-id-2548'/>
         <return type-id='type-id-4'/>
       </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-11'/>
         <parameter type-id='type-id-303'/>
-        <parameter type-id='type-id-724'/>
+        <parameter type-id='type-id-725'/>
         <parameter type-id='type-id-2548'/>
         <return type-id='type-id-4'/>
       </function-decl>
@@ -39156,41 +39156,41 @@
         </member-function>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-605' const='yes' id='type-id-2552'/>
+    <qualified-type-def type-id='type-id-606' const='yes' id='type-id-2552'/>
     <reference-type-def kind='lvalue' type-id='type-id-2552' size-in-bits='64' id='type-id-2548'/>
 
 
     <function-decl name='__strtof_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='46' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-685'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-538'/>
     </function-decl>
     <function-decl name='__strtod_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='45' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-685'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-536'/>
     </function-decl>
     <function-decl name='strtold_l' filepath='/usr/include/stdlib.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-684'/>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-685'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-539'/>
     </function-decl>
     <function-decl name='__newlocale' 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='49' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-36'/>
       <parameter type-id='type-id-11'/>
-      <parameter type-id='type-id-955'/>
-      <return type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
+      <return type-id='type-id-956'/>
     </function-decl>
     <function-decl name='__freelocale' 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='50' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
       <return type-id='type-id-4'/>
     </function-decl>
     <function-decl name='__duplocale' 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='51' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-955'/>
-      <return type-id='type-id-955'/>
+      <parameter type-id='type-id-956'/>
+      <return type-id='type-id-956'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/allocator-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'>
@@ -39201,7 +39201,7 @@
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/concept-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'>
     <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-784'>
+      <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-785'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='191' column='1' id='type-id-455'/>
         </member-type>
@@ -39212,10 +39212,10 @@
           <typedef-decl name='reference' type-id='type-id-188' 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-457'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-783' 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='189' column='1' id='type-id-2553'/>
+          <typedef-decl name='iterator_category' type-id='type-id-784' 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='189' column='1' id='type-id-2553'/>
         </member-type>
       </class-decl>
-      <class-decl name='iterator_traits&lt;const wchar_t*&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-785'>
+      <class-decl name='iterator_traits&lt;const wchar_t*&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-786'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-56' 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='191' column='1' id='type-id-486'/>
         </member-type>
@@ -39226,7 +39226,7 @@
           <typedef-decl name='reference' type-id='type-id-255' 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-488'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-783' 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='189' column='1' id='type-id-2554'/>
+          <typedef-decl name='iterator_category' type-id='type-id-784' 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='189' column='1' id='type-id-2554'/>
         </member-type>
       </class-decl>
     </namespace-decl>
@@ -39633,7 +39633,7 @@
       </function-decl>
       <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-2558'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='__a' type-id='type-id-733' 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-734' 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>
         <member-function access='public'>
           <function-decl name='__constraints' mangled-name='_ZN9__gnu_cxx18_AssignableConceptISt19ostreambuf_iteratorIcSt11char_traitsIcEEE13__constraintsEv' 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='174' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -39651,7 +39651,7 @@
       </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-2561'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='__a' type-id='type-id-736' 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-737' 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>
         <member-function access='public'>
           <function-decl name='__constraints' mangled-name='_ZN9__gnu_cxx18_AssignableConceptISt19ostreambuf_iteratorIwSt11char_traitsIwEEE13__constraintsEv' 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='174' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -39834,9 +39834,9 @@
         <return type-id='type-id-23'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-741' size-in-bits='64' id='type-id-2555'/>
-    <reference-type-def kind='lvalue' type-id='type-id-743' size-in-bits='64' id='type-id-2556'/>
-    <reference-type-def kind='lvalue' type-id='type-id-745' size-in-bits='64' id='type-id-2557'/>
+    <reference-type-def kind='lvalue' type-id='type-id-742' size-in-bits='64' id='type-id-2555'/>
+    <reference-type-def kind='lvalue' type-id='type-id-744' size-in-bits='64' id='type-id-2556'/>
+    <reference-type-def kind='lvalue' type-id='type-id-746' size-in-bits='64' id='type-id-2557'/>
 
     <pointer-type-def type-id='type-id-2558' size-in-bits='64' id='type-id-2559'/>
     <reference-type-def kind='lvalue' type-id='type-id-1069' size-in-bits='64' id='type-id-2560'/>
@@ -39887,7 +39887,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-2583' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <parameter type-id='type-id-51'/>
             <parameter type-id='type-id-2582'/>
             <return type-id='type-id-4'/>
@@ -39902,7 +39902,7 @@
         <member-function access='private'>
           <function-decl name='file' mangled-name='_ZN9__gnu_cxx13stdio_filebufIwSt11char_traitsIwEE4fileEv' 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='120' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2583' is-artificial='yes'/>
-            <return type-id='type-id-597'/>
+            <return type-id='type-id-598'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -39923,7 +39923,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-2583' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <parameter type-id='type-id-51'/>
             <parameter type-id='type-id-2582'/>
             <return type-id='type-id-4'/>
@@ -39974,7 +39974,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-2586' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <parameter type-id='type-id-51'/>
             <parameter type-id='type-id-2585'/>
             <return type-id='type-id-4'/>
@@ -39989,7 +39989,7 @@
         <member-function access='private'>
           <function-decl name='file' mangled-name='_ZN9__gnu_cxx13stdio_filebufIcSt11char_traitsIcEE4fileEv' 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='120' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-2586' is-artificial='yes'/>
-            <return type-id='type-id-597'/>
+            <return type-id='type-id-598'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
@@ -40010,7 +40010,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-2586' is-artificial='yes'/>
-            <parameter type-id='type-id-597'/>
+            <parameter type-id='type-id-598'/>
             <parameter type-id='type-id-51'/>
             <parameter type-id='type-id-2585'/>
             <return type-id='type-id-4'/>
@@ -40084,7 +40084,7 @@
           <var-decl name='_M_c_string' type-id='type-id-149' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='593' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='_M_c_string_lock' type-id='type-id-777' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
+          <var-decl name='_M_c_string_lock' type-id='type-id-778' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rope_RopeRep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='611' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -40414,7 +40414,7 @@
           <var-decl name='_M_ref_count' type-id='type-id-2639' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='460' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='_M_ref_count_lock' type-id='type-id-777' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='464' column='1'/>
+          <var-decl name='_M_ref_count_lock' type-id='type-id-778' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='464' column='1'/>
         </data-member>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Refcount_Base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='469' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -40482,7 +40482,7 @@
           <var-decl name='_M_c_string' type-id='type-id-219' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='593' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='_M_c_string_lock' type-id='type-id-777' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
+          <var-decl name='_M_c_string_lock' type-id='type-id-778' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='595' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rope_RopeRep' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/rope' line='611' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -40809,93 +40809,92 @@
     <pointer-type-def type-id='type-id-2581' size-in-bits='64' id='type-id-2583'/>
     <pointer-type-def type-id='type-id-2584' size-in-bits='64' id='type-id-2586'/>
 
-    <array-type-def dimensions='1' type-id='type-id-69' size-in-bits='2944' id='type-id-2690'>
-      <subrange length='46' type-id='type-id-515' id='type-id-2691'/>
+    <array-type-def dimensions='1' type-id='type-id-2323' size-in-bits='2944' id='type-id-2597'>
+      <subrange length='46' type-id='type-id-515' id='type-id-2690'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-2690' const='yes' id='type-id-2597'/>
     <pointer-type-def type-id='type-id-2590' size-in-bits='64' id='type-id-2603'/>
     <pointer-type-def type-id='type-id-2592' size-in-bits='64' id='type-id-2622'/>
-    <qualified-type-def type-id='type-id-2621' const='yes' id='type-id-2692'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2692' size-in-bits='64' id='type-id-2623'/>
+    <qualified-type-def type-id='type-id-2621' const='yes' id='type-id-2691'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2691' size-in-bits='64' id='type-id-2623'/>
     <reference-type-def kind='lvalue' type-id='type-id-2592' size-in-bits='64' id='type-id-2625'/>
-    <qualified-type-def type-id='type-id-2592' const='yes' id='type-id-2693'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2693' size-in-bits='64' id='type-id-2624'/>
+    <qualified-type-def type-id='type-id-2592' const='yes' id='type-id-2692'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2692' size-in-bits='64' id='type-id-2624'/>
     <pointer-type-def type-id='type-id-2594' size-in-bits='64' id='type-id-2627'/>
-    <qualified-type-def type-id='type-id-2626' const='yes' id='type-id-2694'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2694' size-in-bits='64' id='type-id-2628'/>
+    <qualified-type-def type-id='type-id-2626' const='yes' id='type-id-2693'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2693' size-in-bits='64' id='type-id-2628'/>
     <reference-type-def kind='lvalue' type-id='type-id-2594' size-in-bits='64' id='type-id-2630'/>
-    <qualified-type-def type-id='type-id-2594' const='yes' id='type-id-2695'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2695' size-in-bits='64' id='type-id-2629'/>
+    <qualified-type-def type-id='type-id-2594' const='yes' id='type-id-2694'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2694' size-in-bits='64' id='type-id-2629'/>
     <pointer-type-def type-id='type-id-2637' size-in-bits='64' id='type-id-2632'/>
     <pointer-type-def type-id='type-id-2596' size-in-bits='64' id='type-id-2633'/>
-    <qualified-type-def type-id='type-id-2631' const='yes' id='type-id-2696'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2696' size-in-bits='64' id='type-id-2634'/>
+    <qualified-type-def type-id='type-id-2631' const='yes' id='type-id-2695'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2695' size-in-bits='64' id='type-id-2634'/>
     <reference-type-def kind='lvalue' type-id='type-id-2596' size-in-bits='64' id='type-id-2636'/>
-    <qualified-type-def type-id='type-id-2596' const='yes' id='type-id-2697'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2697' size-in-bits='64' id='type-id-2635'/>
-    <qualified-type-def type-id='type-id-2599' const='yes' id='type-id-2698'/>
-    <pointer-type-def type-id='type-id-2698' size-in-bits='64' id='type-id-2613'/>
+    <qualified-type-def type-id='type-id-2596' const='yes' id='type-id-2696'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2696' size-in-bits='64' id='type-id-2635'/>
+    <qualified-type-def type-id='type-id-2599' const='yes' id='type-id-2697'/>
+    <pointer-type-def type-id='type-id-2697' size-in-bits='64' id='type-id-2613'/>
     <reference-type-def kind='lvalue' type-id='type-id-2602' size-in-bits='64' id='type-id-2615'/>
     <pointer-type-def type-id='type-id-2599' size-in-bits='64' id='type-id-2614'/>
-    <qualified-type-def type-id='type-id-2602' const='yes' id='type-id-2699'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2699' size-in-bits='64' id='type-id-2616'/>
+    <qualified-type-def type-id='type-id-2602' const='yes' id='type-id-2698'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2698' size-in-bits='64' id='type-id-2616'/>
     <pointer-type-def type-id='type-id-2608' size-in-bits='64' id='type-id-2617'/>
     <pointer-type-def type-id='type-id-2609' size-in-bits='64' id='type-id-2618'/>
     <pointer-type-def type-id='type-id-2610' size-in-bits='64' id='type-id-2619'/>
     <pointer-type-def type-id='type-id-2611' size-in-bits='64' id='type-id-2620'/>
     <qualified-type-def type-id='type-id-2638' volatile='yes' id='type-id-2639'/>
     <pointer-type-def type-id='type-id-2600' size-in-bits='64' id='type-id-2640'/>
-    <qualified-type-def type-id='type-id-2601' const='yes' id='type-id-2700'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2700' size-in-bits='64' id='type-id-2604'/>
+    <qualified-type-def type-id='type-id-2601' const='yes' id='type-id-2699'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2699' size-in-bits='64' id='type-id-2604'/>
     <reference-type-def kind='lvalue' type-id='type-id-2601' size-in-bits='64' id='type-id-2605'/>
     <reference-type-def kind='lvalue' type-id='type-id-2590' size-in-bits='64' id='type-id-2607'/>
-    <qualified-type-def type-id='type-id-2590' const='yes' id='type-id-2701'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2701' size-in-bits='64' id='type-id-2606'/>
+    <qualified-type-def type-id='type-id-2590' const='yes' id='type-id-2700'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2700' size-in-bits='64' id='type-id-2606'/>
     <pointer-type-def type-id='type-id-2589' size-in-bits='64' id='type-id-2598'/>
     <pointer-type-def type-id='type-id-2644' size-in-bits='64' id='type-id-2655'/>
     <pointer-type-def type-id='type-id-2646' size-in-bits='64' id='type-id-2674'/>
-    <qualified-type-def type-id='type-id-2673' const='yes' id='type-id-2702'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2702' size-in-bits='64' id='type-id-2675'/>
+    <qualified-type-def type-id='type-id-2673' const='yes' id='type-id-2701'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2701' size-in-bits='64' id='type-id-2675'/>
     <reference-type-def kind='lvalue' type-id='type-id-2646' size-in-bits='64' id='type-id-2677'/>
-    <qualified-type-def type-id='type-id-2646' const='yes' id='type-id-2703'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2703' size-in-bits='64' id='type-id-2676'/>
+    <qualified-type-def type-id='type-id-2646' const='yes' id='type-id-2702'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2702' size-in-bits='64' id='type-id-2676'/>
     <pointer-type-def type-id='type-id-2648' size-in-bits='64' id='type-id-2679'/>
-    <qualified-type-def type-id='type-id-2678' const='yes' id='type-id-2704'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2704' size-in-bits='64' id='type-id-2680'/>
+    <qualified-type-def type-id='type-id-2678' const='yes' id='type-id-2703'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2703' size-in-bits='64' id='type-id-2680'/>
     <reference-type-def kind='lvalue' type-id='type-id-2648' size-in-bits='64' id='type-id-2682'/>
-    <qualified-type-def type-id='type-id-2648' const='yes' id='type-id-2705'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2705' size-in-bits='64' id='type-id-2681'/>
+    <qualified-type-def type-id='type-id-2648' const='yes' id='type-id-2704'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2704' size-in-bits='64' id='type-id-2681'/>
     <pointer-type-def type-id='type-id-2689' size-in-bits='64' id='type-id-2684'/>
     <pointer-type-def type-id='type-id-2650' size-in-bits='64' id='type-id-2685'/>
-    <qualified-type-def type-id='type-id-2683' const='yes' id='type-id-2706'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2706' size-in-bits='64' id='type-id-2686'/>
+    <qualified-type-def type-id='type-id-2683' const='yes' id='type-id-2705'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2705' size-in-bits='64' id='type-id-2686'/>
     <reference-type-def kind='lvalue' type-id='type-id-2650' size-in-bits='64' id='type-id-2688'/>
-    <qualified-type-def type-id='type-id-2650' const='yes' id='type-id-2707'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2707' size-in-bits='64' id='type-id-2687'/>
-    <qualified-type-def type-id='type-id-2652' const='yes' id='type-id-2708'/>
-    <pointer-type-def type-id='type-id-2708' size-in-bits='64' id='type-id-2665'/>
+    <qualified-type-def type-id='type-id-2650' const='yes' id='type-id-2706'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2706' size-in-bits='64' id='type-id-2687'/>
+    <qualified-type-def type-id='type-id-2652' const='yes' id='type-id-2707'/>
+    <pointer-type-def type-id='type-id-2707' size-in-bits='64' id='type-id-2665'/>
     <reference-type-def kind='lvalue' type-id='type-id-2654' size-in-bits='64' id='type-id-2667'/>
     <pointer-type-def type-id='type-id-2652' size-in-bits='64' id='type-id-2666'/>
-    <qualified-type-def type-id='type-id-2654' const='yes' id='type-id-2709'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2709' size-in-bits='64' id='type-id-2668'/>
+    <qualified-type-def type-id='type-id-2654' const='yes' id='type-id-2708'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2708' size-in-bits='64' id='type-id-2668'/>
     <pointer-type-def type-id='type-id-2660' size-in-bits='64' id='type-id-2669'/>
     <pointer-type-def type-id='type-id-2661' size-in-bits='64' id='type-id-2670'/>
     <pointer-type-def type-id='type-id-2662' size-in-bits='64' id='type-id-2671'/>
     <pointer-type-def type-id='type-id-2663' size-in-bits='64' id='type-id-2672'/>
-    <qualified-type-def type-id='type-id-2653' const='yes' id='type-id-2710'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2710' size-in-bits='64' id='type-id-2656'/>
+    <qualified-type-def type-id='type-id-2653' const='yes' id='type-id-2709'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2709' size-in-bits='64' id='type-id-2656'/>
     <reference-type-def kind='lvalue' type-id='type-id-2653' size-in-bits='64' id='type-id-2657'/>
     <reference-type-def kind='lvalue' type-id='type-id-2644' size-in-bits='64' id='type-id-2659'/>
-    <qualified-type-def type-id='type-id-2644' const='yes' id='type-id-2711'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2711' size-in-bits='64' id='type-id-2658'/>
+    <qualified-type-def type-id='type-id-2644' const='yes' id='type-id-2710'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2710' size-in-bits='64' id='type-id-2658'/>
     <pointer-type-def type-id='type-id-2643' size-in-bits='64' id='type-id-2651'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <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-643'/>
+        <parameter type-id='type-id-644'/>
         <return type-id='type-id-2400'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::ctype&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt5ctypeIcEEbRKSt6locale' 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='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt5ctypeIcEEbRKSt6locale@@GLIBCXX_3.4'>
@@ -40908,7 +40907,7 @@
       </function-decl>
       <function-decl name='use_facet&lt;std::num_put&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_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_facetISt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2712'/>
+        <return type-id='type-id-2711'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::num_get&lt;char&gt; &gt;' mangled-name='_ZSt9has_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale' 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='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
@@ -40916,7 +40915,7 @@
       </function-decl>
       <function-decl name='use_facet&lt;std::num_get&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_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_facetISt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2713'/>
+        <return type-id='type-id-2712'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::ctype&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt5ctypeIwEEbRKSt6locale' 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='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt5ctypeIwEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
@@ -40932,7 +40931,7 @@
       </function-decl>
       <function-decl name='use_facet&lt;std::num_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_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_facetISt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2714'/>
+        <return type-id='type-id-2713'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale' 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='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
@@ -40940,43 +40939,43 @@
       </function-decl>
       <function-decl name='use_facet&lt;std::num_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_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_facetISt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2715'/>
+        <return type-id='type-id-2714'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-925' size-in-bits='64' id='type-id-2712'/>
-    <reference-type-def kind='lvalue' type-id='type-id-923' size-in-bits='64' id='type-id-2713'/>
-    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-2714'/>
-    <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-2715'/>
+    <reference-type-def kind='lvalue' type-id='type-id-926' size-in-bits='64' id='type-id-2711'/>
+    <reference-type-def kind='lvalue' type-id='type-id-924' size-in-bits='64' id='type-id-2712'/>
+    <reference-type-def kind='lvalue' type-id='type-id-927' size-in-bits='64' id='type-id-2713'/>
+    <reference-type-def kind='lvalue' type-id='type-id-925' size-in-bits='64' id='type-id-2714'/>
 
 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/iostream-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'>
     <namespace-decl name='std'>
 
-      <class-decl name='_Setfill&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/iomanip' line='153' column='1' id='type-id-2716'>
+      <class-decl name='_Setfill&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/iomanip' line='153' column='1' id='type-id-2715'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_c' type-id='type-id-15' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='153' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='setfill&lt;char&gt;' mangled-name='_ZSt7setfillIcESt8_SetfillIT_ES1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-15'/>
-        <return type-id='type-id-2716'/>
+        <return type-id='type-id-2715'/>
       </function-decl>
-      <class-decl name='_Setfill&lt;wchar_t&gt;' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='153' column='1' id='type-id-2717'>
+      <class-decl name='_Setfill&lt;wchar_t&gt;' size-in-bits='32' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='153' column='1' id='type-id-2716'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_c' type-id='type-id-105' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='153' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='setfill&lt;wchar_t&gt;' mangled-name='_ZSt7setfillIwESt8_SetfillIT_ES1_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-105'/>
-        <return type-id='type-id-2717'/>
+        <return type-id='type-id-2716'/>
       </function-decl>
-      <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-2718'>
+      <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-2717'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-321'/>
-        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-774'/>
+        <base-class access='public' layout-offset-in-bits='128' type-id='type-id-775'/>
         <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-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-113'/>
@@ -40985,7 +40984,7 @@
         </member-function>
         <member-function access='protected'>
           <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='824' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -40993,7 +40992,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E' 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' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-113'/>
@@ -41002,7 +41001,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E' 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' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1EPSt15basic_streambufIwS1_E@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-113'/>
@@ -41011,7 +41010,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -41019,7 +41018,7 @@
         </member-function>
         <member-function access='protected'>
           <function-decl name='basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='824' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -41027,7 +41026,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <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='821' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -41035,7 +41034,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -41043,7 +41042,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -41051,7 +41050,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_iostream' mangled-name='_ZNSt14basic_iostreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_iostreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2719' is-artificial='yes'/>
+            <parameter type-id='type-id-2718' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -41061,7 +41060,7 @@
     </namespace-decl>
 
 
-    <pointer-type-def type-id='type-id-2718' size-in-bits='64' id='type-id-2719'/>
+    <pointer-type-def type-id='type-id-2717' size-in-bits='64' id='type-id-2718'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <namespace-decl name='std'>
@@ -41076,16 +41075,16 @@
         <return type-id='type-id-2331'/>
       </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-723'/>
-        <return type-id='type-id-2713'/>
+        <parameter type-id='type-id-724'/>
+        <return type-id='type-id-2712'/>
       </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'>
         <parameter type-id='type-id-5'/>
         <return type-id='type-id-5'/>
       </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-730'/>
-        <return type-id='type-id-2715'/>
+        <parameter type-id='type-id-731'/>
+        <return type-id='type-id-2714'/>
       </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'>
         <parameter type-id='type-id-867'/>
@@ -41108,12 +41107,12 @@
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsISt11char_traitsIcEERSt13basic_istreamIcT_ES5_Rh' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsISt11char_traitsIcEERSt13basic_istreamIcT_ES5_Rh@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2720'/>
+        <parameter type-id='type-id-2719'/>
         <return type-id='type-id-289'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsISt11char_traitsIcEERSt13basic_istreamIcT_ES5_Ra' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='730' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsISt11char_traitsIcEERSt13basic_istreamIcT_ES5_Ra@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2721'/>
+        <parameter type-id='type-id-2720'/>
         <return type-id='type-id-289'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsISt11char_traitsIcEERSt13basic_istreamIcT_ES5_Ph' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/istream' line='772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsISt11char_traitsIcEERSt13basic_istreamIcT_ES5_Ph@@GLIBCXX_3.4'>
@@ -41128,57 +41127,57 @@
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St8_SetfillIS3_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St8_SetfillIS3_E@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2716'/>
+        <parameter type-id='type-id-2715'/>
         <return type-id='type-id-289'/>
       </function-decl>
-      <class-decl name='_Setiosflags' 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/iomanip' line='85' column='1' id='type-id-2722'>
+      <class-decl name='_Setiosflags' 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/iomanip' line='85' column='1' id='type-id-2721'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_mask' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='85' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St12_Setiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St12_Setiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2722'/>
+        <parameter type-id='type-id-2721'/>
         <return type-id='type-id-289'/>
       </function-decl>
-      <class-decl name='_Resetiosflags' 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/iomanip' line='55' column='1' id='type-id-2723'>
+      <class-decl name='_Resetiosflags' 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/iomanip' line='55' column='1' id='type-id-2722'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_mask' type-id='type-id-72' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='55' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St14_Resetiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St14_Resetiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2723'/>
+        <parameter type-id='type-id-2722'/>
         <return type-id='type-id-289'/>
       </function-decl>
-      <class-decl name='_Setbase' 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/iomanip' line='115' column='1' id='type-id-2724'>
+      <class-decl name='_Setbase' 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/iomanip' line='115' column='1' id='type-id-2723'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_base' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='115' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St8_Setbase' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St8_Setbase@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2724'/>
+        <parameter type-id='type-id-2723'/>
         <return type-id='type-id-289'/>
       </function-decl>
-      <class-decl name='_Setprecision' 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/iomanip' line='184' column='1' id='type-id-2725'>
+      <class-decl name='_Setprecision' 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/iomanip' line='184' column='1' id='type-id-2724'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_n' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='184' column='1'/>
         </data-member>
       </class-decl>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St13_Setprecision' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St13_Setprecision@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2725'/>
+        <parameter type-id='type-id-2724'/>
         <return type-id='type-id-289'/>
       </function-decl>
-      <class-decl name='_Setw' 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/iomanip' line='214' column='1' id='type-id-2726'>
+      <class-decl name='_Setw' 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/iomanip' line='214' column='1' id='type-id-2725'>
         <data-member access='public' layout-offset-in-bits='0'>
           <var-decl name='_M_n' type-id='type-id-36' 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>
       <function-decl name='operator&gt;&gt;&lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St5_Setw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIcSt11char_traitsIcEERSt13basic_istreamIT_T0_ES6_St5_Setw@@GLIBCXX_3.4'>
         <parameter type-id='type-id-289'/>
-        <parameter type-id='type-id-2726'/>
+        <parameter type-id='type-id-2725'/>
         <return type-id='type-id-289'/>
       </function-decl>
       <function-decl name='ws&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZSt2wsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/istream.tcc' line='1018' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt2wsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_@@GLIBCXX_3.4'>
@@ -41192,52 +41191,52 @@
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St8_SetfillIS3_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St8_SetfillIS3_E@@GLIBCXX_3.4'>
         <parameter type-id='type-id-328'/>
-        <parameter type-id='type-id-2717'/>
+        <parameter type-id='type-id-2716'/>
         <return type-id='type-id-328'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St12_Setiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St12_Setiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-328'/>
-        <parameter type-id='type-id-2722'/>
+        <parameter type-id='type-id-2721'/>
         <return type-id='type-id-328'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St14_Resetiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St14_Resetiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-328'/>
-        <parameter type-id='type-id-2723'/>
+        <parameter type-id='type-id-2722'/>
         <return type-id='type-id-328'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St8_Setbase' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St8_Setbase@@GLIBCXX_3.4'>
         <parameter type-id='type-id-328'/>
-        <parameter type-id='type-id-2724'/>
+        <parameter type-id='type-id-2723'/>
         <return type-id='type-id-328'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St13_Setprecision' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St13_Setprecision@@GLIBCXX_3.4'>
         <parameter type-id='type-id-328'/>
-        <parameter type-id='type-id-2725'/>
+        <parameter type-id='type-id-2724'/>
         <return type-id='type-id-328'/>
       </function-decl>
       <function-decl name='operator&gt;&gt;&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St5_Setw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStrsIwSt11char_traitsIwEERSt13basic_istreamIT_T0_ES6_St5_Setw@@GLIBCXX_3.4'>
         <parameter type-id='type-id-328'/>
-        <parameter type-id='type-id-2726'/>
+        <parameter type-id='type-id-2725'/>
         <return type-id='type-id-328'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-287' const='yes' id='type-id-2727'/>
-    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-2728'/>
-    <qualified-type-def type-id='type-id-298' const='yes' id='type-id-2729'/>
-    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-2730'/>
+    <qualified-type-def type-id='type-id-287' const='yes' id='type-id-2726'/>
+    <qualified-type-def type-id='type-id-285' const='yes' id='type-id-2727'/>
+    <qualified-type-def type-id='type-id-298' const='yes' id='type-id-2728'/>
+    <qualified-type-def type-id='type-id-295' const='yes' id='type-id-2729'/>
     <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-952'>
+      <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-953'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-36' 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-725'/>
+          <typedef-decl name='__type' type-id='type-id-36' 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-726'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-326' const='yes' id='type-id-2731'/>
-    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-2732'/>
-    <qualified-type-def type-id='type-id-337' const='yes' id='type-id-2733'/>
-    <qualified-type-def type-id='type-id-334' const='yes' id='type-id-2734'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-2720'/>
-    <reference-type-def kind='lvalue' type-id='type-id-508' size-in-bits='64' id='type-id-2721'/>
+    <qualified-type-def type-id='type-id-326' const='yes' id='type-id-2730'/>
+    <qualified-type-def type-id='type-id-324' const='yes' id='type-id-2731'/>
+    <qualified-type-def type-id='type-id-337' const='yes' id='type-id-2732'/>
+    <qualified-type-def type-id='type-id-334' const='yes' id='type-id-2733'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1549' size-in-bits='64' id='type-id-2719'/>
+    <reference-type-def kind='lvalue' type-id='type-id-508' size-in-bits='64' id='type-id-2720'/>
 
 
   </abi-instr>
@@ -41251,7 +41250,7 @@
       <function-decl name='__distance&lt;const char*&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='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-11'/>
         <parameter type-id='type-id-11'/>
-        <parameter type-id='type-id-783'/>
+        <parameter type-id='type-id-784'/>
         <return type-id='type-id-455'/>
       </function-decl>
       <function-decl name='distance&lt;const char*&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'>
@@ -41274,47 +41273,47 @@
       </function-decl>
       <function-decl name='use_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7codecvtIcc11__mbstate_tEERKT_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_facetISt7codecvtIcc11__mbstate_tEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2735'/>
+        <return type-id='type-id-2734'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::collate&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt7collateIcEERKT_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_facetISt7collateIcEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2736'/>
+        <return type-id='type-id-2735'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::numpunct&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt8numpunctIcEERKT_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_facetISt8numpunctIcEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2737'/>
+        <return type-id='type-id-2736'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::moneypunct&lt;char, true&gt; &gt;' mangled-name='_ZSt9use_facetISt10moneypunctIcLb1EEERKT_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_facetISt10moneypunctIcLb1EEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2738'/>
+        <return type-id='type-id-2737'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::moneypunct&lt;char, false&gt; &gt;' mangled-name='_ZSt9use_facetISt10moneypunctIcLb0EEERKT_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_facetISt10moneypunctIcLb0EEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2739'/>
+        <return type-id='type-id-2738'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::money_put&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_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_facetISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2740'/>
+        <return type-id='type-id-2739'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::money_get&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_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_facetISt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2741'/>
+        <return type-id='type-id-2740'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::__timepunct&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt11__timepunctIcEERKT_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_facetISt11__timepunctIcEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2742'/>
+        <return type-id='type-id-2741'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::time_put&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_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_facetISt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2743'/>
+        <return type-id='type-id-2742'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::time_get&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_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_facetISt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2744'/>
+        <return type-id='type-id-2743'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::messages&lt;char&gt; &gt;' mangled-name='_ZSt9use_facetISt8messagesIcEERKT_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_facetISt8messagesIcEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2745'/>
+        <return type-id='type-id-2744'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::codecvt&lt;char, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7codecvtIcc11__mbstate_tEEbRKSt6locale' 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='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7codecvtIcc11__mbstate_tEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
@@ -41382,249 +41381,249 @@
         <return type-id='type-id-36'/>
       </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-733'/>
+        <parameter type-id='type-id-734'/>
         <parameter type-id='type-id-11'/>
         <parameter type-id='type-id-36'/>
-        <return type-id='type-id-733'/>
+        <return type-id='type-id-734'/>
       </function-decl>
-      <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-2746'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-635'/>
+      <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-2745'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-636'/>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-637'/>
         <member-type access='private'>
-          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-2747'/>
+          <typedef-decl name='char_type' type-id='type-id-15' filepath='/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-2746'/>
         </member-type>
         <member-function access='private' const='yes'>
           <function-decl name='is' mangled-name='_ZNKSt21__ctype_abstract_baseIcE2isEtc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='164' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-2746'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is' mangled-name='_ZNKSt21__ctype_abstract_baseIcE2isEPKcS2_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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-645'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-646'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='scan_is' mangled-name='_ZNKSt21__ctype_abstract_baseIcE7scan_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='197' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='scan_not' mangled-name='_ZNKSt21__ctype_abstract_baseIcE8scan_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='213' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='toupper' mangled-name='_ZNKSt21__ctype_abstract_baseIcE7toupperEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='227' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2747'/>
-            <return type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2746'/>
+            <return type-id='type-id-2746'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='toupper' mangled-name='_ZNKSt21__ctype_abstract_baseIcE7toupperEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2750'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='tolower' mangled-name='_ZNKSt21__ctype_abstract_baseIcE7tolowerEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2747'/>
-            <return type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2746'/>
+            <return type-id='type-id-2746'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='tolower' mangled-name='_ZNKSt21__ctype_abstract_baseIcE7tolowerEPcPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2750'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='widen' mangled-name='_ZNKSt21__ctype_abstract_baseIcE5widenEc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-2747'/>
+            <return type-id='type-id-2746'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='widen' mangled-name='_ZNKSt21__ctype_abstract_baseIcE5widenEPKcS2_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='307' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-2750'/>
+            <parameter type-id='type-id-2749'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='narrow' mangled-name='_ZNKSt21__ctype_abstract_baseIcE6narrowEcc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='326' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2746'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='narrow' mangled-name='_ZNKSt21__ctype_abstract_baseIcE6narrowEPKcS2_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='348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-2749'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='__ctype_abstract_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='354' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2751' is-artificial='yes'/>
+            <parameter type-id='type-id-2750' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__ctype_abstract_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2751' is-artificial='yes'/>
+            <parameter type-id='type-id-2750' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__ctype_abstract_base' mangled-name='_ZNSt21__ctype_abstract_baseIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2751' is-artificial='yes'/>
+            <parameter type-id='type-id-2750' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~__ctype_abstract_base' mangled-name='_ZNSt21__ctype_abstract_baseIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='357' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2751' is-artificial='yes'/>
+            <parameter type-id='type-id-2750' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <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-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-2746'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='3'>
           <function-decl name='do_is' mangled-name='_ZNKSt21__ctype_abstract_baseIcE5do_isEPKcS2_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='392' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-645'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-646'/>
+            <return type-id='type-id-2748'/>
           </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-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <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-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-644'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-645'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='6'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt21__ctype_abstract_baseIcE10do_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='448' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2747'/>
-            <return type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2746'/>
+            <return type-id='type-id-2746'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='7'>
           <function-decl name='do_toupper' mangled-name='_ZNKSt21__ctype_abstract_baseIcE10do_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='465' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2750'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='8'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt21__ctype_abstract_baseIcE10do_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='481' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2747'/>
-            <return type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2746'/>
+            <return type-id='type-id-2746'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='9'>
           <function-decl name='do_tolower' mangled-name='_ZNKSt21__ctype_abstract_baseIcE10do_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='498' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2750'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-2749'/>
-            <return type-id='type-id-2749'/>
+            <parameter type-id='type-id-2748'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='10'>
           <function-decl name='do_widen' mangled-name='_ZNKSt21__ctype_abstract_baseIcE8do_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='517' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-15'/>
-            <return type-id='type-id-2747'/>
+            <return type-id='type-id-2746'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='11'>
           <function-decl name='do_widen' mangled-name='_ZNKSt21__ctype_abstract_baseIcE8do_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='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
-            <parameter type-id='type-id-2750'/>
+            <parameter type-id='type-id-2749'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='12'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt21__ctype_abstract_baseIcE9do_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='559' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2747'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2746'/>
             <parameter type-id='type-id-15'/>
             <return type-id='type-id-15'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes' vtable-offset='13'>
           <function-decl name='do_narrow' mangled-name='_ZNKSt21__ctype_abstract_baseIcE9do_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='584' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2748' is-artificial='yes'/>
-            <parameter type-id='type-id-2749'/>
-            <parameter type-id='type-id-2749'/>
+            <parameter type-id='type-id-2747' is-artificial='yes'/>
+            <parameter type-id='type-id-2748'/>
+            <parameter type-id='type-id-2748'/>
             <parameter type-id='type-id-15'/>
             <parameter type-id='type-id-149'/>
-            <return type-id='type-id-2749'/>
+            <return type-id='type-id-2748'/>
           </function-decl>
         </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-2752'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-932'/>
+      <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-2751'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-933'/>
         <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-2753' is-artificial='yes'/>
+            <parameter type-id='type-id-2752' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41632,7 +41631,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='collate_byname' mangled-name='_ZNSt14collate_bynameIcEC2EPKcm' filepath='/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' elf-symbol-id='_ZNSt14collate_bynameIcEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2753' is-artificial='yes'/>
+            <parameter type-id='type-id-2752' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41640,31 +41639,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2753' is-artificial='yes'/>
+            <parameter type-id='type-id-2752' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate_byname' mangled-name='_ZNSt14collate_bynameIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14collate_bynameIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2753' is-artificial='yes'/>
+            <parameter type-id='type-id-2752' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate_byname' mangled-name='_ZNSt14collate_bynameIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14collate_bynameIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2753' is-artificial='yes'/>
+            <parameter type-id='type-id-2752' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='codecvt_byname&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='459' column='1' id='type-id-2754'>
+      <class-decl name='codecvt_byname&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='459' column='1' id='type-id-2753'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-386'/>
         <member-function access='private'>
           <function-decl name='codecvt_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2755' is-artificial='yes'/>
+            <parameter type-id='type-id-2754' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41672,7 +41671,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIcc11__mbstate_tEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIcc11__mbstate_tEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2755' is-artificial='yes'/>
+            <parameter type-id='type-id-2754' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41680,31 +41679,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2755' is-artificial='yes'/>
+            <parameter type-id='type-id-2754' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIcc11__mbstate_tED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIcc11__mbstate_tED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2755' is-artificial='yes'/>
+            <parameter type-id='type-id-2754' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIcc11__mbstate_tED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIcc11__mbstate_tED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2755' is-artificial='yes'/>
+            <parameter type-id='type-id-2754' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2756'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-934'/>
+      <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-2755'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-935'/>
         <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-2757' is-artificial='yes'/>
+            <parameter type-id='type-id-2756' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41712,7 +41711,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='messages_byname' mangled-name='_ZNSt15messages_bynameIcEC2EPKcm' 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' elf-symbol-id='_ZNSt15messages_bynameIcEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2757' is-artificial='yes'/>
+            <parameter type-id='type-id-2756' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41720,31 +41719,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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/bits/locale_facets_nonio.h' line='1890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2757' is-artificial='yes'/>
+            <parameter type-id='type-id-2756' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages_byname' mangled-name='_ZNSt15messages_bynameIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15messages_bynameIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2757' is-artificial='yes'/>
+            <parameter type-id='type-id-2756' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages_byname' mangled-name='_ZNSt15messages_bynameIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15messages_bynameIcED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2757' is-artificial='yes'/>
+            <parameter type-id='type-id-2756' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2758'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-944'/>
+      <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-2757'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
         <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-2759' is-artificial='yes'/>
+            <parameter type-id='type-id-2758' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41752,7 +41751,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIcEC2EPKcm' filepath='/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' elf-symbol-id='_ZNSt15numpunct_bynameIcEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
+            <parameter type-id='type-id-2758' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41760,34 +41759,34 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='1898' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
+            <parameter type-id='type-id-2758' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIcED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1898' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15numpunct_bynameIcED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
+            <parameter type-id='type-id-2758' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIcED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1898' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15numpunct_bynameIcED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2759' is-artificial='yes'/>
+            <parameter type-id='type-id-2758' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2760'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-941'/>
+      <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-2759'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-942'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-1006' 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>
         <member-function access='private'>
           <function-decl name='moneypunct_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='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2761' is-artificial='yes'/>
+            <parameter type-id='type-id-2760' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41795,7 +41794,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb1EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb1EEC2EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2761' is-artificial='yes'/>
+            <parameter type-id='type-id-2760' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41803,34 +41802,34 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_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='1348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2761' is-artificial='yes'/>
+            <parameter type-id='type-id-2760' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2761' is-artificial='yes'/>
+            <parameter type-id='type-id-2760' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb1EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2761' is-artificial='yes'/>
+            <parameter type-id='type-id-2760' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2762'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-940'/>
+      <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-2761'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-941'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-1006' 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>
         <member-function access='private'>
           <function-decl name='moneypunct_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='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
+            <parameter type-id='type-id-2762' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41838,7 +41837,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb0EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb0EEC2EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
+            <parameter type-id='type-id-2762' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41846,31 +41845,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_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='1348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
+            <parameter type-id='type-id-2762' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
+            <parameter type-id='type-id-2762' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIcLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIcLb0EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2763' is-artificial='yes'/>
+            <parameter type-id='type-id-2762' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2764'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-948'/>
+      <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-2763'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-949'/>
         <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-2765' is-artificial='yes'/>
+            <parameter type-id='type-id-2764' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41878,7 +41877,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='time_put_byname' mangled-name='_ZNSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC2EPKcm' filepath='/tmp/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' elf-symbol-id='_ZNSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2765' is-artificial='yes'/>
+            <parameter type-id='type-id-2764' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41886,31 +41885,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='825' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2765' is-artificial='yes'/>
+            <parameter type-id='type-id-2764' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put_byname' mangled-name='_ZNSt15time_put_bynameIcSt19ostreambuf_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='825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2765' is-artificial='yes'/>
+            <parameter type-id='type-id-2764' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put_byname' mangled-name='_ZNSt15time_put_bynameIcSt19ostreambuf_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='825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_put_bynameIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2765' is-artificial='yes'/>
+            <parameter type-id='type-id-2764' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2766'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-946'/>
+      <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-2765'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-947'/>
         <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-2767' is-artificial='yes'/>
+            <parameter type-id='type-id-2766' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41918,7 +41917,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='time_get_byname' mangled-name='_ZNSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC2EPKcm' filepath='/tmp/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' elf-symbol-id='_ZNSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2767' is-artificial='yes'/>
+            <parameter type-id='type-id-2766' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -41926,27 +41925,27 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='699' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2767' is-artificial='yes'/>
+            <parameter type-id='type-id-2766' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get_byname' mangled-name='_ZNSt15time_get_bynameIcSt19istreambuf_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='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2767' is-artificial='yes'/>
+            <parameter type-id='type-id-2766' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get_byname' mangled-name='_ZNSt15time_get_bynameIcSt19istreambuf_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='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_get_bynameIcSt19istreambuf_iteratorIcSt11char_traitsIcEEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2767' is-artificial='yes'/>
+            <parameter type-id='type-id-2766' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__pad&lt;char, std::char_traits&lt;char&gt; &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/locale_facets.h' line='90' column='1' id='type-id-2768'>
+      <class-decl name='__pad&lt;char, std::char_traits&lt;char&gt; &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/locale_facets.h' line='90' column='1' id='type-id-2767'>
         <member-function access='private' static='yes'>
           <function-decl name='_S_pad' mangled-name='_ZNSt5__padIcSt11char_traitsIcEE6_S_padERSt8ios_basecPcPKcll' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-102'/>
@@ -41959,30 +41958,30 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;char, true&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2769'>
+      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;char, true&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2768'>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt11__use_cacheISt18__moneypunct_cacheIcLb1EEEclERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2770' is-artificial='yes'/>
+            <parameter type-id='type-id-2769' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <return type-id='type-id-2771'/>
+            <return type-id='type-id-2770'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;char, false&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2772'>
+      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;char, false&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2771'>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt11__use_cacheISt18__moneypunct_cacheIcLb0EEEclERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2773' is-artificial='yes'/>
+            <parameter type-id='type-id-2772' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <return type-id='type-id-2774'/>
+            <return type-id='type-id-2773'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__use_cache&lt;std::__numpunct_cache&lt;char&gt; &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/locale_facets.tcc' line='52' column='1' id='type-id-2775'>
+      <class-decl name='__use_cache&lt;std::__numpunct_cache&lt;char&gt; &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/locale_facets.tcc' line='52' column='1' id='type-id-2774'>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt11__use_cacheISt16__numpunct_cacheIcEEclERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2776' is-artificial='yes'/>
+            <parameter type-id='type-id-2775' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <return type-id='type-id-2777'/>
+            <return type-id='type-id-2776'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -41992,66 +41991,66 @@
         <return type-id='type-id-23'/>
       </function-decl>
       <function-decl name='__write&lt;char&gt;' mangled-name='_ZSt7__writeIcESt19ostreambuf_iteratorIT_St11char_traitsIS1_EES4_PKS1_i' filepath='/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-733'/>
+        <parameter type-id='type-id-734'/>
         <parameter type-id='type-id-11'/>
         <parameter type-id='type-id-36'/>
-        <return type-id='type-id-733'/>
+        <return type-id='type-id-734'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-905' size-in-bits='64' id='type-id-2735'/>
+    <reference-type-def kind='lvalue' type-id='type-id-906' size-in-bits='64' id='type-id-2734'/>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;const char&gt;' 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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-11'/>
         <return type-id='type-id-23'/>
       </function-decl>
       <function-decl name='__uselocale' 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='53' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-955'/>
-        <return type-id='type-id-955'/>
+        <parameter type-id='type-id-956'/>
+        <return type-id='type-id-956'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-966' const='yes' id='type-id-2778'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-2736'/>
+    <qualified-type-def type-id='type-id-966' const='yes' id='type-id-2777'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1083' size-in-bits='64' id='type-id-2735'/>
 
 
-    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-2737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1099' size-in-bits='64' id='type-id-2736'/>
 
-    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-2738'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1095' size-in-bits='64' id='type-id-2739'/>
-    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-2779'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-2740'/>
-    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-2780'/>
-    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-2781'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1089' size-in-bits='64' id='type-id-2741'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-2742'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1103' size-in-bits='64' id='type-id-2743'/>
-    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-2782'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1101' size-in-bits='64' id='type-id-2744'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-2745'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1096' size-in-bits='64' id='type-id-2737'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1095' size-in-bits='64' id='type-id-2738'/>
+    <qualified-type-def type-id='type-id-990' const='yes' id='type-id-2778'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1091' size-in-bits='64' id='type-id-2739'/>
+    <qualified-type-def type-id='type-id-869' const='yes' id='type-id-2779'/>
+    <qualified-type-def type-id='type-id-980' const='yes' id='type-id-2780'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1089' size-in-bits='64' id='type-id-2740'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1081' size-in-bits='64' id='type-id-2741'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1103' size-in-bits='64' id='type-id-2742'/>
+    <qualified-type-def type-id='type-id-1040' const='yes' id='type-id-2781'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1101' size-in-bits='64' id='type-id-2743'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1085' size-in-bits='64' id='type-id-2744'/>
 
-    <qualified-type-def type-id='type-id-722' const='yes' id='type-id-2783'/>
+    <qualified-type-def type-id='type-id-723' const='yes' id='type-id-2782'/>
+    <qualified-type-def type-id='type-id-2745' const='yes' id='type-id-2783'/>
+    <pointer-type-def type-id='type-id-2783' size-in-bits='64' id='type-id-2747'/>
     <qualified-type-def type-id='type-id-2746' const='yes' id='type-id-2784'/>
     <pointer-type-def type-id='type-id-2784' size-in-bits='64' id='type-id-2748'/>
-    <qualified-type-def type-id='type-id-2747' const='yes' id='type-id-2785'/>
-    <pointer-type-def type-id='type-id-2785' size-in-bits='64' id='type-id-2749'/>
-    <pointer-type-def type-id='type-id-2747' size-in-bits='64' id='type-id-2750'/>
-    <pointer-type-def type-id='type-id-2746' size-in-bits='64' id='type-id-2751'/>
-    <pointer-type-def type-id='type-id-2752' size-in-bits='64' id='type-id-2753'/>
-    <pointer-type-def type-id='type-id-2754' size-in-bits='64' id='type-id-2755'/>
-    <pointer-type-def type-id='type-id-2756' size-in-bits='64' id='type-id-2757'/>
-    <pointer-type-def type-id='type-id-2758' size-in-bits='64' id='type-id-2759'/>
-    <pointer-type-def type-id='type-id-2760' size-in-bits='64' id='type-id-2761'/>
-    <pointer-type-def type-id='type-id-2762' size-in-bits='64' id='type-id-2763'/>
-    <pointer-type-def type-id='type-id-2764' size-in-bits='64' id='type-id-2765'/>
-    <pointer-type-def type-id='type-id-2766' size-in-bits='64' id='type-id-2767'/>
-    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-2771'/>
-    <qualified-type-def type-id='type-id-2769' const='yes' id='type-id-2786'/>
-    <pointer-type-def type-id='type-id-2786' size-in-bits='64' id='type-id-2770'/>
-    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-2774'/>
-    <qualified-type-def type-id='type-id-2772' const='yes' id='type-id-2787'/>
-    <pointer-type-def type-id='type-id-2787' size-in-bits='64' id='type-id-2773'/>
-    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-2777'/>
-    <qualified-type-def type-id='type-id-2775' const='yes' id='type-id-2788'/>
-    <pointer-type-def type-id='type-id-2788' size-in-bits='64' id='type-id-2776'/>
+    <pointer-type-def type-id='type-id-2746' size-in-bits='64' id='type-id-2749'/>
+    <pointer-type-def type-id='type-id-2745' size-in-bits='64' id='type-id-2750'/>
+    <pointer-type-def type-id='type-id-2751' size-in-bits='64' id='type-id-2752'/>
+    <pointer-type-def type-id='type-id-2753' size-in-bits='64' id='type-id-2754'/>
+    <pointer-type-def type-id='type-id-2755' size-in-bits='64' id='type-id-2756'/>
+    <pointer-type-def type-id='type-id-2757' size-in-bits='64' id='type-id-2758'/>
+    <pointer-type-def type-id='type-id-2759' size-in-bits='64' id='type-id-2760'/>
+    <pointer-type-def type-id='type-id-2761' size-in-bits='64' id='type-id-2762'/>
+    <pointer-type-def type-id='type-id-2763' size-in-bits='64' id='type-id-2764'/>
+    <pointer-type-def type-id='type-id-2765' size-in-bits='64' id='type-id-2766'/>
+    <pointer-type-def type-id='type-id-1149' size-in-bits='64' id='type-id-2770'/>
+    <qualified-type-def type-id='type-id-2768' const='yes' id='type-id-2785'/>
+    <pointer-type-def type-id='type-id-2785' size-in-bits='64' id='type-id-2769'/>
+    <pointer-type-def type-id='type-id-1148' size-in-bits='64' id='type-id-2773'/>
+    <qualified-type-def type-id='type-id-2771' const='yes' id='type-id-2786'/>
+    <pointer-type-def type-id='type-id-2786' size-in-bits='64' id='type-id-2772'/>
+    <pointer-type-def type-id='type-id-1152' size-in-bits='64' id='type-id-2776'/>
+    <qualified-type-def type-id='type-id-2774' const='yes' id='type-id-2787'/>
+    <pointer-type-def type-id='type-id-2787' size-in-bits='64' id='type-id-2775'/>
     <function-decl name='textdomain' filepath='/usr/include/libintl.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-11'/>
       <return type-id='type-id-149'/>
@@ -42084,8 +42083,8 @@
     </namespace-decl>
 
 
-    <qualified-type-def type-id='type-id-2334' const='yes' id='type-id-2789'/>
-    <qualified-type-def type-id='type-id-2288' const='yes' id='type-id-2790'/>
+    <qualified-type-def type-id='type-id-2334' const='yes' id='type-id-2788'/>
+    <qualified-type-def type-id='type-id-2288' const='yes' id='type-id-2789'/>
 
     <function-decl name='fseeko64' filepath='/usr/include/stdio.h' line='813' column='1' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-550'/>
@@ -42126,8 +42125,8 @@
         <return type-id='type-id-4'/>
       </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-734'/>
-        <return type-id='type-id-2712'/>
+        <parameter type-id='type-id-735'/>
+        <return type-id='type-id-2711'/>
       </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'>
         <parameter type-id='type-id-833'/>
@@ -42144,8 +42143,8 @@
         <return type-id='type-id-833'/>
       </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-738'/>
-        <return type-id='type-id-2714'/>
+        <parameter type-id='type-id-739'/>
+        <return type-id='type-id-2713'/>
       </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'>
         <parameter type-id='type-id-851'/>
@@ -42171,32 +42170,32 @@
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St8_SetfillIS3_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St8_SetfillIS3_E@@GLIBCXX_3.4'>
         <parameter type-id='type-id-833'/>
-        <parameter type-id='type-id-2716'/>
+        <parameter type-id='type-id-2715'/>
         <return type-id='type-id-833'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St12_Setiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St12_Setiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-833'/>
-        <parameter type-id='type-id-2722'/>
+        <parameter type-id='type-id-2721'/>
         <return type-id='type-id-833'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St14_Resetiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St14_Resetiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-833'/>
-        <parameter type-id='type-id-2723'/>
+        <parameter type-id='type-id-2722'/>
         <return type-id='type-id-833'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St8_Setbase' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St8_Setbase@@GLIBCXX_3.4'>
         <parameter type-id='type-id-833'/>
-        <parameter type-id='type-id-2724'/>
+        <parameter type-id='type-id-2723'/>
         <return type-id='type-id-833'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St13_Setprecision' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St13_Setprecision@@GLIBCXX_3.4'>
         <parameter type-id='type-id-833'/>
-        <parameter type-id='type-id-2725'/>
+        <parameter type-id='type-id-2724'/>
         <return type-id='type-id-833'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;char, std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St5_Setw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIcSt11char_traitsIcEERSt13basic_ostreamIT_T0_ES6_St5_Setw@@GLIBCXX_3.4'>
         <parameter type-id='type-id-833'/>
-        <parameter type-id='type-id-2726'/>
+        <parameter type-id='type-id-2725'/>
         <return type-id='type-id-833'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;std::char_traits&lt;char&gt; &gt;' mangled-name='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_a' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='486' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_a@@GLIBCXX_3.4'>
@@ -42234,32 +42233,32 @@
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St8_SetfillIS3_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St8_SetfillIS3_E@@GLIBCXX_3.4'>
         <parameter type-id='type-id-851'/>
-        <parameter type-id='type-id-2717'/>
+        <parameter type-id='type-id-2716'/>
         <return type-id='type-id-851'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St12_Setiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St12_Setiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-851'/>
-        <parameter type-id='type-id-2722'/>
+        <parameter type-id='type-id-2721'/>
         <return type-id='type-id-851'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St14_Resetiosflags' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St14_Resetiosflags@@GLIBCXX_3.4'>
         <parameter type-id='type-id-851'/>
-        <parameter type-id='type-id-2723'/>
+        <parameter type-id='type-id-2722'/>
         <return type-id='type-id-851'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St8_Setbase' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St8_Setbase@@GLIBCXX_3.4'>
         <parameter type-id='type-id-851'/>
-        <parameter type-id='type-id-2724'/>
+        <parameter type-id='type-id-2723'/>
         <return type-id='type-id-851'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St13_Setprecision' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St13_Setprecision@@GLIBCXX_3.4'>
         <parameter type-id='type-id-851'/>
-        <parameter type-id='type-id-2725'/>
+        <parameter type-id='type-id-2724'/>
         <return type-id='type-id-851'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St5_Setw' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/iomanip' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_St5_Setw@@GLIBCXX_3.4'>
         <parameter type-id='type-id-851'/>
-        <parameter type-id='type-id-2726'/>
+        <parameter type-id='type-id-2725'/>
         <return type-id='type-id-851'/>
       </function-decl>
       <function-decl name='operator&lt;&lt; &lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' mangled-name='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_PKS3_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ostream' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZStlsIwSt11char_traitsIwEERSt13basic_ostreamIT_T0_ES6_PKS3_@@GLIBCXX_3.4'>
@@ -42286,12 +42285,12 @@
         <return type-id='type-id-851'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-2791'/>
-    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-2792'/>
-    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-2793'/>
-    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-2794'/>
-    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-2795'/>
-    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-2796'/>
+    <qualified-type-def type-id='type-id-837' const='yes' id='type-id-2790'/>
+    <qualified-type-def type-id='type-id-836' const='yes' id='type-id-2791'/>
+    <qualified-type-def type-id='type-id-840' const='yes' id='type-id-2792'/>
+    <qualified-type-def type-id='type-id-855' const='yes' id='type-id-2793'/>
+    <qualified-type-def type-id='type-id-854' const='yes' id='type-id-2794'/>
+    <qualified-type-def type-id='type-id-858' const='yes' id='type-id-2795'/>
 
 
 
@@ -42304,20 +42303,20 @@
         <parameter type-id='type-id-1976'/>
         <return type-id='type-id-1976'/>
       </function-decl>
-      <class-decl name='basic_stringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='2944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='483' column='1' id='type-id-2797'>
+      <class-decl name='basic_stringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' size-in-bits='2944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='483' column='1' id='type-id-2796'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2374'/>
         <member-type access='private'>
-          <typedef-decl name='__stringbuf_type' type-id='type-id-2225' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='498' column='1' id='type-id-2798'/>
+          <typedef-decl name='__stringbuf_type' type-id='type-id-2225' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='498' column='1' id='type-id-2797'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__string_type' type-id='type-id-146' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='497' column='1' id='type-id-2799'/>
+          <typedef-decl name='__string_type' type-id='type-id-146' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='497' column='1' id='type-id-2798'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_stringbuf' type-id='type-id-2798' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='502' column='1'/>
+          <var-decl name='_M_stringbuf' type-id='type-id-2797' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='502' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42326,36 +42325,36 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2801'/>
+            <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt18basic_stringstreamIcSt11char_traitsIcESaIcEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt18basic_stringstreamIcSt11char_traitsIcESaIcEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2802' is-artificial='yes'/>
-            <return type-id='type-id-2803'/>
+            <parameter type-id='type-id-2801' is-artificial='yes'/>
+            <return type-id='type-id-2802'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='str' mangled-name='_ZNKSt18basic_stringstreamIcSt11char_traitsIcESaIcEE3strEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt18basic_stringstreamIcSt11char_traitsIcESaIcEE3strEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2802' is-artificial='yes'/>
-            <return type-id='type-id-2799'/>
+            <parameter type-id='type-id-2801' is-artificial='yes'/>
+            <return type-id='type-id-2798'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEE3strERKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEE3strERKSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
-            <parameter type-id='type-id-2801'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
+            <parameter type-id='type-id-2800'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42364,7 +42363,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42373,27 +42372,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2801'/>
+            <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2801'/>
+            <parameter type-id='type-id-2800'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42401,7 +42400,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42409,7 +42408,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42417,27 +42416,27 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2800' is-artificial='yes'/>
+            <parameter type-id='type-id-2799' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_istringstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' 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/sstream' line='263' column='1' id='type-id-2804'>
+      <class-decl name='basic_istringstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' 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/sstream' line='263' column='1' id='type-id-2803'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-321'/>
         <member-type access='private'>
-          <typedef-decl name='__stringbuf_type' type-id='type-id-2245' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='278' column='1' id='type-id-2805'/>
+          <typedef-decl name='__stringbuf_type' type-id='type-id-2245' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='278' column='1' id='type-id-2804'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__string_type' type-id='type-id-216' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='277' column='1' id='type-id-2806'/>
+          <typedef-decl name='__string_type' type-id='type-id-216' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='277' column='1' id='type-id-2805'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_stringbuf' type-id='type-id-2805' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='282' column='1'/>
+          <var-decl name='_M_stringbuf' type-id='type-id-2804' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='282' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42446,36 +42445,36 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2808'/>
+            <parameter type-id='type-id-2807'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt19basic_istringstreamIwSt11char_traitsIwESaIwEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt19basic_istringstreamIwSt11char_traitsIwESaIwEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2809' is-artificial='yes'/>
-            <return type-id='type-id-2810'/>
+            <parameter type-id='type-id-2808' is-artificial='yes'/>
+            <return type-id='type-id-2809'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='str' mangled-name='_ZNKSt19basic_istringstreamIwSt11char_traitsIwESaIwEE3strEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt19basic_istringstreamIwSt11char_traitsIwESaIwEE3strEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2809' is-artificial='yes'/>
-            <return type-id='type-id-2806'/>
+            <parameter type-id='type-id-2808' is-artificial='yes'/>
+            <return type-id='type-id-2805'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEE3strERKSbIwS1_S2_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEE3strERKSbIwS1_S2_E@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
-            <parameter type-id='type-id-2808'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
+            <parameter type-id='type-id-2807'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42484,7 +42483,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42493,27 +42492,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2808'/>
+            <parameter type-id='type-id-2807'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2808'/>
+            <parameter type-id='type-id-2807'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42521,7 +42520,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42529,7 +42528,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42537,27 +42536,27 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIwSt11char_traitsIwESaIwEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2807' is-artificial='yes'/>
+            <parameter type-id='type-id-2806' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_istringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' 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/sstream' line='263' column='1' id='type-id-2811'>
+      <class-decl name='basic_istringstream&lt;char, std::char_traits&lt;char&gt;, std::allocator&lt;char&gt; &gt;' 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/sstream' line='263' column='1' id='type-id-2810'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
         <member-type access='private'>
-          <typedef-decl name='__stringbuf_type' type-id='type-id-2225' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='278' column='1' id='type-id-2812'/>
+          <typedef-decl name='__stringbuf_type' type-id='type-id-2225' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='278' column='1' id='type-id-2811'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__string_type' type-id='type-id-146' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='277' column='1' id='type-id-2813'/>
+          <typedef-decl name='__string_type' type-id='type-id-146' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='277' column='1' id='type-id-2812'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_stringbuf' type-id='type-id-2812' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='282' column='1'/>
+          <var-decl name='_M_stringbuf' type-id='type-id-2811' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='282' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42566,36 +42565,36 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2815'/>
+            <parameter type-id='type-id-2814'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt19basic_istringstreamIcSt11char_traitsIcESaIcEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='339' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt19basic_istringstreamIcSt11char_traitsIcESaIcEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2816' is-artificial='yes'/>
-            <return type-id='type-id-2817'/>
+            <parameter type-id='type-id-2815' is-artificial='yes'/>
+            <return type-id='type-id-2816'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='str' mangled-name='_ZNKSt19basic_istringstreamIcSt11char_traitsIcESaIcEE3strEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt19basic_istringstreamIcSt11char_traitsIcESaIcEE3strEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2816' is-artificial='yes'/>
-            <return type-id='type-id-2813'/>
+            <parameter type-id='type-id-2815' is-artificial='yes'/>
+            <return type-id='type-id-2812'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEE3strERKSs' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEE3strERKSs@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
-            <parameter type-id='type-id-2815'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
+            <parameter type-id='type-id-2814'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42604,7 +42603,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42613,27 +42612,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2815'/>
+            <parameter type-id='type-id-2814'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2815'/>
+            <parameter type-id='type-id-2814'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42641,7 +42640,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42649,7 +42648,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42657,27 +42656,27 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_istringstream' mangled-name='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt19basic_istringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2814' is-artificial='yes'/>
+            <parameter type-id='type-id-2813' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_stringstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='2944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='483' column='1' id='type-id-2818'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2718'/>
+      <class-decl name='basic_stringstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt;, std::allocator&lt;wchar_t&gt; &gt;' size-in-bits='2944' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='483' column='1' id='type-id-2817'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2717'/>
         <member-type access='private'>
-          <typedef-decl name='__stringbuf_type' type-id='type-id-2245' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='498' column='1' id='type-id-2819'/>
+          <typedef-decl name='__stringbuf_type' type-id='type-id-2245' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='498' column='1' id='type-id-2818'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='__string_type' type-id='type-id-216' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='497' column='1' id='type-id-2820'/>
+          <typedef-decl name='__string_type' type-id='type-id-216' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='497' column='1' id='type-id-2819'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_stringbuf' type-id='type-id-2819' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='502' column='1'/>
+          <var-decl name='_M_stringbuf' type-id='type-id-2818' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='502' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42686,36 +42685,36 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2822'/>
+            <parameter type-id='type-id-2821'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt18basic_stringstreamIwSt11char_traitsIwESaIwEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt18basic_stringstreamIwSt11char_traitsIwESaIwEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2823' is-artificial='yes'/>
-            <return type-id='type-id-2824'/>
+            <parameter type-id='type-id-2822' is-artificial='yes'/>
+            <return type-id='type-id-2823'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='str' mangled-name='_ZNKSt18basic_stringstreamIwSt11char_traitsIwESaIwEE3strEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt18basic_stringstreamIwSt11char_traitsIwESaIwEE3strEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2823' is-artificial='yes'/>
-            <return type-id='type-id-2820'/>
+            <parameter type-id='type-id-2822' is-artificial='yes'/>
+            <return type-id='type-id-2819'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='str' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEE3strERKSbIwS1_S2_E' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEE3strERKSbIwS1_S2_E@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
-            <parameter type-id='type-id-2822'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
+            <parameter type-id='type-id-2821'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42724,7 +42723,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-51'/>
@@ -42733,27 +42732,27 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC2ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2822'/>
+            <parameter type-id='type-id-2821'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEEC1ERKSbIwS1_S2_ESt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
-            <parameter type-id='type-id-2822'/>
+            <parameter type-id='type-id-2821'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42761,7 +42760,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42769,7 +42768,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42777,7 +42776,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_stringstream' mangled-name='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/sstream' line='545' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt18basic_stringstreamIwSt11char_traitsIwESaIwEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2821' is-artificial='yes'/>
+            <parameter type-id='type-id-2820' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -42787,43 +42786,43 @@
     </namespace-decl>
 
 
-    <qualified-type-def type-id='type-id-2232' const='yes' id='type-id-2825'/>
-    <qualified-type-def type-id='type-id-2227' const='yes' id='type-id-2826'/>
-    <qualified-type-def type-id='type-id-2230' const='yes' id='type-id-2827'/>
-    <qualified-type-def type-id='type-id-2252' const='yes' id='type-id-2828'/>
-    <qualified-type-def type-id='type-id-2247' const='yes' id='type-id-2829'/>
-    <qualified-type-def type-id='type-id-2250' const='yes' id='type-id-2830'/>
-    <pointer-type-def type-id='type-id-2797' size-in-bits='64' id='type-id-2800'/>
-    <qualified-type-def type-id='type-id-2799' const='yes' id='type-id-2831'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2831' size-in-bits='64' id='type-id-2801'/>
-    <pointer-type-def type-id='type-id-2798' size-in-bits='64' id='type-id-2803'/>
-    <qualified-type-def type-id='type-id-2797' const='yes' id='type-id-2832'/>
-    <pointer-type-def type-id='type-id-2832' size-in-bits='64' id='type-id-2802'/>
-    <pointer-type-def type-id='type-id-2804' size-in-bits='64' id='type-id-2807'/>
-    <qualified-type-def type-id='type-id-2806' const='yes' id='type-id-2833'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2833' size-in-bits='64' id='type-id-2808'/>
-    <pointer-type-def type-id='type-id-2805' size-in-bits='64' id='type-id-2810'/>
-    <qualified-type-def type-id='type-id-2804' const='yes' id='type-id-2834'/>
-    <pointer-type-def type-id='type-id-2834' size-in-bits='64' id='type-id-2809'/>
-    <pointer-type-def type-id='type-id-2811' size-in-bits='64' id='type-id-2814'/>
-    <qualified-type-def type-id='type-id-2813' const='yes' id='type-id-2835'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2835' size-in-bits='64' id='type-id-2815'/>
-    <pointer-type-def type-id='type-id-2812' size-in-bits='64' id='type-id-2817'/>
-    <qualified-type-def type-id='type-id-2811' const='yes' id='type-id-2836'/>
-    <pointer-type-def type-id='type-id-2836' size-in-bits='64' id='type-id-2816'/>
-    <pointer-type-def type-id='type-id-2818' size-in-bits='64' id='type-id-2821'/>
-    <qualified-type-def type-id='type-id-2820' const='yes' id='type-id-2837'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2837' size-in-bits='64' id='type-id-2822'/>
-    <pointer-type-def type-id='type-id-2819' size-in-bits='64' id='type-id-2824'/>
-    <qualified-type-def type-id='type-id-2818' const='yes' id='type-id-2838'/>
-    <pointer-type-def type-id='type-id-2838' size-in-bits='64' id='type-id-2823'/>
+    <qualified-type-def type-id='type-id-2232' const='yes' id='type-id-2824'/>
+    <qualified-type-def type-id='type-id-2227' const='yes' id='type-id-2825'/>
+    <qualified-type-def type-id='type-id-2230' const='yes' id='type-id-2826'/>
+    <qualified-type-def type-id='type-id-2252' const='yes' id='type-id-2827'/>
+    <qualified-type-def type-id='type-id-2247' const='yes' id='type-id-2828'/>
+    <qualified-type-def type-id='type-id-2250' const='yes' id='type-id-2829'/>
+    <pointer-type-def type-id='type-id-2796' size-in-bits='64' id='type-id-2799'/>
+    <qualified-type-def type-id='type-id-2798' const='yes' id='type-id-2830'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2830' size-in-bits='64' id='type-id-2800'/>
+    <pointer-type-def type-id='type-id-2797' size-in-bits='64' id='type-id-2802'/>
+    <qualified-type-def type-id='type-id-2796' const='yes' id='type-id-2831'/>
+    <pointer-type-def type-id='type-id-2831' size-in-bits='64' id='type-id-2801'/>
+    <pointer-type-def type-id='type-id-2803' size-in-bits='64' id='type-id-2806'/>
+    <qualified-type-def type-id='type-id-2805' const='yes' id='type-id-2832'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2832' size-in-bits='64' id='type-id-2807'/>
+    <pointer-type-def type-id='type-id-2804' size-in-bits='64' id='type-id-2809'/>
+    <qualified-type-def type-id='type-id-2803' const='yes' id='type-id-2833'/>
+    <pointer-type-def type-id='type-id-2833' size-in-bits='64' id='type-id-2808'/>
+    <pointer-type-def type-id='type-id-2810' size-in-bits='64' id='type-id-2813'/>
+    <qualified-type-def type-id='type-id-2812' const='yes' id='type-id-2834'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2834' size-in-bits='64' id='type-id-2814'/>
+    <pointer-type-def type-id='type-id-2811' size-in-bits='64' id='type-id-2816'/>
+    <qualified-type-def type-id='type-id-2810' const='yes' id='type-id-2835'/>
+    <pointer-type-def type-id='type-id-2835' size-in-bits='64' id='type-id-2815'/>
+    <pointer-type-def type-id='type-id-2817' size-in-bits='64' id='type-id-2820'/>
+    <qualified-type-def type-id='type-id-2819' const='yes' id='type-id-2836'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2836' size-in-bits='64' id='type-id-2821'/>
+    <pointer-type-def type-id='type-id-2818' size-in-bits='64' id='type-id-2823'/>
+    <qualified-type-def type-id='type-id-2817' const='yes' id='type-id-2837'/>
+    <pointer-type-def type-id='type-id-2837' size-in-bits='64' id='type-id-2822'/>
   </abi-instr>
   <abi-instr version='1.0' 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-39' const='yes' id='type-id-2839'/>
-    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-2840'/>
+    <qualified-type-def type-id='type-id-39' const='yes' id='type-id-2838'/>
+    <qualified-type-def type-id='type-id-123' const='yes' id='type-id-2839'/>
   </abi-instr>
   <abi-instr version='1.0' 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'>
     <namespace-decl name='std'>
@@ -42835,7 +42834,7 @@
       <function-decl name='__distance&lt;const wchar_t*&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='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-249'/>
         <parameter type-id='type-id-249'/>
-        <parameter type-id='type-id-783'/>
+        <parameter type-id='type-id-784'/>
         <return type-id='type-id-486'/>
       </function-decl>
       <function-decl name='distance&lt;const wchar_t*&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'>
@@ -42850,47 +42849,47 @@
       </function-decl>
       <function-decl name='use_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7codecvtIwc11__mbstate_tEERKT_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_facetISt7codecvtIwc11__mbstate_tEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2841'/>
+        <return type-id='type-id-2840'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::collate&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt7collateIwEERKT_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_facetISt7collateIwEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2842'/>
+        <return type-id='type-id-2841'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::numpunct&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt8numpunctIwEERKT_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_facetISt8numpunctIwEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2843'/>
+        <return type-id='type-id-2842'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::moneypunct&lt;wchar_t, true&gt; &gt;' mangled-name='_ZSt9use_facetISt10moneypunctIwLb1EEERKT_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_facetISt10moneypunctIwLb1EEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2844'/>
+        <return type-id='type-id-2843'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::moneypunct&lt;wchar_t, false&gt; &gt;' mangled-name='_ZSt9use_facetISt10moneypunctIwLb0EEERKT_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_facetISt10moneypunctIwLb0EEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2845'/>
+        <return type-id='type-id-2844'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::money_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_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_facetISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2846'/>
+        <return type-id='type-id-2845'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::money_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_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_facetISt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2847'/>
+        <return type-id='type-id-2846'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::__timepunct&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt11__timepunctIwEERKT_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_facetISt11__timepunctIwEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2848'/>
+        <return type-id='type-id-2847'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::time_put&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_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_facetISt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2849'/>
+        <return type-id='type-id-2848'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::time_get&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_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_facetISt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2850'/>
+        <return type-id='type-id-2849'/>
       </function-decl>
       <function-decl name='use_facet&lt;std::messages&lt;wchar_t&gt; &gt;' mangled-name='_ZSt9use_facetISt8messagesIwEERKT_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_facetISt8messagesIwEERKT_RKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
-        <return type-id='type-id-2851'/>
+        <return type-id='type-id-2850'/>
       </function-decl>
       <function-decl name='has_facet&lt;std::codecvt&lt;wchar_t, char, __mbstate_t&gt; &gt;' mangled-name='_ZSt9has_facetISt7codecvtIwc11__mbstate_tEEbRKSt6locale' 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='103' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt9has_facetISt7codecvtIwc11__mbstate_tEEbRKSt6locale@@GLIBCXX_3.4'>
         <parameter type-id='type-id-31'/>
@@ -42958,16 +42957,16 @@
         <return type-id='type-id-36'/>
       </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-736'/>
+        <parameter type-id='type-id-737'/>
         <parameter type-id='type-id-249'/>
         <parameter type-id='type-id-36'/>
-        <return type-id='type-id-736'/>
+        <return type-id='type-id-737'/>
       </function-decl>
-      <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-2852'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-933'/>
+      <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-2851'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-934'/>
         <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-2853' is-artificial='yes'/>
+            <parameter type-id='type-id-2852' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -42975,7 +42974,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='collate_byname' mangled-name='_ZNSt14collate_bynameIwEC2EPKcm' filepath='/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' elf-symbol-id='_ZNSt14collate_bynameIwEC2EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2853' is-artificial='yes'/>
+            <parameter type-id='type-id-2852' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -42983,31 +42982,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='783' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2853' is-artificial='yes'/>
+            <parameter type-id='type-id-2852' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate_byname' mangled-name='_ZNSt14collate_bynameIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14collate_bynameIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2853' is-artificial='yes'/>
+            <parameter type-id='type-id-2852' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~collate_byname' mangled-name='_ZNSt14collate_bynameIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_classes.h' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14collate_bynameIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2853' is-artificial='yes'/>
+            <parameter type-id='type-id-2852' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='codecvt_byname&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='459' column='1' id='type-id-2854'>
+      <class-decl name='codecvt_byname&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='459' column='1' id='type-id-2853'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-411'/>
         <member-function access='private'>
           <function-decl name='codecvt_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2855' is-artificial='yes'/>
+            <parameter type-id='type-id-2854' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43015,7 +43014,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIwc11__mbstate_tEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIwc11__mbstate_tEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2855' is-artificial='yes'/>
+            <parameter type-id='type-id-2854' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43023,31 +43022,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt_byname' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2855' is-artificial='yes'/>
+            <parameter type-id='type-id-2854' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIwc11__mbstate_tED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIwc11__mbstate_tED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2855' is-artificial='yes'/>
+            <parameter type-id='type-id-2854' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~codecvt_byname' mangled-name='_ZNSt14codecvt_bynameIwc11__mbstate_tED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/codecvt.h' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14codecvt_bynameIwc11__mbstate_tED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2855' is-artificial='yes'/>
+            <parameter type-id='type-id-2854' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2856'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-935'/>
+      <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-2855'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-936'/>
         <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-2857' is-artificial='yes'/>
+            <parameter type-id='type-id-2856' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43055,7 +43054,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='messages_byname' mangled-name='_ZNSt15messages_bynameIwEC2EPKcm' 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' elf-symbol-id='_ZNSt15messages_bynameIwEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2857' is-artificial='yes'/>
+            <parameter type-id='type-id-2856' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43063,31 +43062,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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/bits/locale_facets_nonio.h' line='1890' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2857' is-artificial='yes'/>
+            <parameter type-id='type-id-2856' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages_byname' mangled-name='_ZNSt15messages_bynameIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15messages_bynameIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2857' is-artificial='yes'/>
+            <parameter type-id='type-id-2856' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~messages_byname' mangled-name='_ZNSt15messages_bynameIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15messages_bynameIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2857' is-artificial='yes'/>
+            <parameter type-id='type-id-2856' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2858'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-945'/>
+      <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-2857'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-946'/>
         <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-2859' is-artificial='yes'/>
+            <parameter type-id='type-id-2858' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43095,7 +43094,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIwEC2EPKcm' filepath='/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' elf-symbol-id='_ZNSt15numpunct_bynameIwEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2859' is-artificial='yes'/>
+            <parameter type-id='type-id-2858' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43103,34 +43102,34 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='1898' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2859' is-artificial='yes'/>
+            <parameter type-id='type-id-2858' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIwED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1898' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15numpunct_bynameIwED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2859' is-artificial='yes'/>
+            <parameter type-id='type-id-2858' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~numpunct_byname' mangled-name='_ZNSt15numpunct_bynameIwED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.h' line='1898' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15numpunct_bynameIwED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2859' is-artificial='yes'/>
+            <parameter type-id='type-id-2858' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2860'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-943'/>
+      <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-2859'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-944'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-1006' 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>
         <member-function access='private'>
           <function-decl name='moneypunct_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='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2861' is-artificial='yes'/>
+            <parameter type-id='type-id-2860' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43138,7 +43137,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb1EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb1EEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2861' is-artificial='yes'/>
+            <parameter type-id='type-id-2860' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43146,34 +43145,34 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_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='1348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2861' is-artificial='yes'/>
+            <parameter type-id='type-id-2860' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb1EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb1EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2861' is-artificial='yes'/>
+            <parameter type-id='type-id-2860' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb1EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb1EED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2861' is-artificial='yes'/>
+            <parameter type-id='type-id-2860' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2862'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-942'/>
+      <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-2861'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-943'/>
         <data-member access='private' static='yes'>
           <var-decl name='intl' type-id='type-id-1006' 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>
         <member-function access='private'>
           <function-decl name='moneypunct_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='1333' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2863' is-artificial='yes'/>
+            <parameter type-id='type-id-2862' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43181,7 +43180,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb0EEC2EPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb0EEC2EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2863' is-artificial='yes'/>
+            <parameter type-id='type-id-2862' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43189,31 +43188,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_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='1348' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2863' is-artificial='yes'/>
+            <parameter type-id='type-id-2862' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb0EED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb0EED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2863' is-artificial='yes'/>
+            <parameter type-id='type-id-2862' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~moneypunct_byname' mangled-name='_ZNSt17moneypunct_bynameIwLb0EED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.h' line='1348' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17moneypunct_bynameIwLb0EED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2863' is-artificial='yes'/>
+            <parameter type-id='type-id-2862' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2864'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-949'/>
+      <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-2863'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-950'/>
         <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-2865' is-artificial='yes'/>
+            <parameter type-id='type-id-2864' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43221,7 +43220,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='time_put_byname' mangled-name='_ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC2EPKcm' filepath='/tmp/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' elf-symbol-id='_ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2865' is-artificial='yes'/>
+            <parameter type-id='type-id-2864' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43229,31 +43228,31 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='825' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2865' is-artificial='yes'/>
+            <parameter type-id='type-id-2864' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put_byname' mangled-name='_ZNSt15time_put_bynameIwSt19ostreambuf_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='825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2865' is-artificial='yes'/>
+            <parameter type-id='type-id-2864' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_put_byname' mangled-name='_ZNSt15time_put_bynameIwSt19ostreambuf_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='825' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_put_bynameIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2865' is-artificial='yes'/>
+            <parameter type-id='type-id-2864' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-2866'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-947'/>
+      <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-2865'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-948'/>
         <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-2867' is-artificial='yes'/>
+            <parameter type-id='type-id-2866' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43261,7 +43260,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='time_get_byname' mangled-name='_ZNSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC2EPKcm' filepath='/tmp/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' elf-symbol-id='_ZNSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEEC1EPKcm@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2867' is-artificial='yes'/>
+            <parameter type-id='type-id-2866' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -43269,27 +43268,27 @@
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <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='699' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2867' is-artificial='yes'/>
+            <parameter type-id='type-id-2866' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get_byname' mangled-name='_ZNSt15time_get_bynameIwSt19istreambuf_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='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2867' is-artificial='yes'/>
+            <parameter type-id='type-id-2866' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes' vtable-offset='-1'>
           <function-decl name='~time_get_byname' mangled-name='_ZNSt15time_get_bynameIwSt19istreambuf_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='699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt15time_get_bynameIwSt19istreambuf_iteratorIwSt11char_traitsIwEEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2867' is-artificial='yes'/>
+            <parameter type-id='type-id-2866' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__pad&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &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/locale_facets.h' line='90' column='1' id='type-id-2868'>
+      <class-decl name='__pad&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &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/locale_facets.h' line='90' column='1' id='type-id-2867'>
         <member-function access='private' static='yes'>
           <function-decl name='_S_pad' mangled-name='_ZNSt5__padIwSt11char_traitsIwEE6_S_padERSt8ios_basewPwPKwll' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='1193' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-102'/>
@@ -43302,30 +43301,30 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;wchar_t, true&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2869'>
+      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;wchar_t, true&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2868'>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt11__use_cacheISt18__moneypunct_cacheIwLb1EEEclERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2870' is-artificial='yes'/>
+            <parameter type-id='type-id-2869' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <return type-id='type-id-2871'/>
+            <return type-id='type-id-2870'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;wchar_t, false&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2872'>
+      <class-decl name='__use_cache&lt;std::__moneypunct_cache&lt;wchar_t, false&gt; &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/locale_facets_nonio.tcc' line='40' column='1' id='type-id-2871'>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt11__use_cacheISt18__moneypunct_cacheIwLb0EEEclERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets_nonio.tcc' line='43' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2873' is-artificial='yes'/>
+            <parameter type-id='type-id-2872' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <return type-id='type-id-2874'/>
+            <return type-id='type-id-2873'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__use_cache&lt;std::__numpunct_cache&lt;wchar_t&gt; &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/locale_facets.tcc' line='52' column='1' id='type-id-2875'>
+      <class-decl name='__use_cache&lt;std::__numpunct_cache&lt;wchar_t&gt; &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/locale_facets.tcc' line='52' column='1' id='type-id-2874'>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt11__use_cacheISt16__numpunct_cacheIwEEclERKSt6locale' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/locale_facets.tcc' line='55' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2876' is-artificial='yes'/>
+            <parameter type-id='type-id-2875' is-artificial='yes'/>
             <parameter type-id='type-id-31'/>
-            <return type-id='type-id-2877'/>
+            <return type-id='type-id-2876'/>
           </function-decl>
         </member-function>
       </class-decl>
@@ -43335,131 +43334,131 @@
         <return type-id='type-id-23'/>
       </function-decl>
       <function-decl name='__write&lt;wchar_t&gt;' mangled-name='_ZSt7__writeIwESt19ostreambuf_iteratorIT_St11char_traitsIS1_EES4_PKS1_i' filepath='/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-736'/>
+        <parameter type-id='type-id-737'/>
         <parameter type-id='type-id-249'/>
         <parameter type-id='type-id-36'/>
-        <return type-id='type-id-736'/>
+        <return type-id='type-id-737'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-908' size-in-bits='64' id='type-id-2841'/>
+    <reference-type-def kind='lvalue' type-id='type-id-909' size-in-bits='64' id='type-id-2840'/>
     <namespace-decl name='__gnu_cxx'>
       <function-decl name='__is_null_pointer&lt;const wchar_t&gt;' 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='150' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-249'/>
         <return type-id='type-id-23'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-2878'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1084' size-in-bits='64' id='type-id-2842'/>
-
-
-    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-2843'/>
-
-    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-2844'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-2845'/>
-    <qualified-type-def type-id='type-id-995' const='yes' id='type-id-2879'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-2846'/>
-    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-2880'/>
-    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-2881'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-2847'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-2848'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-2849'/>
-    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-2882'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1102' size-in-bits='64' id='type-id-2850'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-2851'/>
-
-    <qualified-type-def type-id='type-id-729' const='yes' id='type-id-2883'/>
-    <pointer-type-def type-id='type-id-2852' size-in-bits='64' id='type-id-2853'/>
-    <pointer-type-def type-id='type-id-2854' size-in-bits='64' id='type-id-2855'/>
-    <pointer-type-def type-id='type-id-2856' size-in-bits='64' id='type-id-2857'/>
-    <pointer-type-def type-id='type-id-2858' size-in-bits='64' id='type-id-2859'/>
-    <pointer-type-def type-id='type-id-2860' size-in-bits='64' id='type-id-2861'/>
-    <pointer-type-def type-id='type-id-2862' size-in-bits='64' id='type-id-2863'/>
-    <pointer-type-def type-id='type-id-2864' size-in-bits='64' id='type-id-2865'/>
-    <pointer-type-def type-id='type-id-2866' size-in-bits='64' id='type-id-2867'/>
-    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-2871'/>
-    <qualified-type-def type-id='type-id-2869' const='yes' id='type-id-2884'/>
-    <pointer-type-def type-id='type-id-2884' size-in-bits='64' id='type-id-2870'/>
-    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-2874'/>
-    <qualified-type-def type-id='type-id-2872' const='yes' id='type-id-2885'/>
-    <pointer-type-def type-id='type-id-2885' size-in-bits='64' id='type-id-2873'/>
-    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-2877'/>
-    <qualified-type-def type-id='type-id-2875' const='yes' id='type-id-2886'/>
-    <pointer-type-def type-id='type-id-2886' size-in-bits='64' id='type-id-2876'/>
+    <qualified-type-def type-id='type-id-968' const='yes' id='type-id-2877'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1084' size-in-bits='64' id='type-id-2841'/>
+
+
+    <reference-type-def kind='lvalue' type-id='type-id-1100' size-in-bits='64' id='type-id-2842'/>
+
+    <reference-type-def kind='lvalue' type-id='type-id-1098' size-in-bits='64' id='type-id-2843'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1097' size-in-bits='64' id='type-id-2844'/>
+    <qualified-type-def type-id='type-id-995' const='yes' id='type-id-2878'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1093' size-in-bits='64' id='type-id-2845'/>
+    <qualified-type-def type-id='type-id-879' const='yes' id='type-id-2879'/>
+    <qualified-type-def type-id='type-id-985' const='yes' id='type-id-2880'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1090' size-in-bits='64' id='type-id-2846'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1082' size-in-bits='64' id='type-id-2847'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1104' size-in-bits='64' id='type-id-2848'/>
+    <qualified-type-def type-id='type-id-1045' const='yes' id='type-id-2881'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1102' size-in-bits='64' id='type-id-2849'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1087' size-in-bits='64' id='type-id-2850'/>
+
+    <qualified-type-def type-id='type-id-730' const='yes' id='type-id-2882'/>
+    <pointer-type-def type-id='type-id-2851' size-in-bits='64' id='type-id-2852'/>
+    <pointer-type-def type-id='type-id-2853' size-in-bits='64' id='type-id-2854'/>
+    <pointer-type-def type-id='type-id-2855' size-in-bits='64' id='type-id-2856'/>
+    <pointer-type-def type-id='type-id-2857' size-in-bits='64' id='type-id-2858'/>
+    <pointer-type-def type-id='type-id-2859' size-in-bits='64' id='type-id-2860'/>
+    <pointer-type-def type-id='type-id-2861' size-in-bits='64' id='type-id-2862'/>
+    <pointer-type-def type-id='type-id-2863' size-in-bits='64' id='type-id-2864'/>
+    <pointer-type-def type-id='type-id-2865' size-in-bits='64' id='type-id-2866'/>
+    <pointer-type-def type-id='type-id-1151' size-in-bits='64' id='type-id-2870'/>
+    <qualified-type-def type-id='type-id-2868' const='yes' id='type-id-2883'/>
+    <pointer-type-def type-id='type-id-2883' size-in-bits='64' id='type-id-2869'/>
+    <pointer-type-def type-id='type-id-1150' size-in-bits='64' id='type-id-2873'/>
+    <qualified-type-def type-id='type-id-2871' const='yes' id='type-id-2884'/>
+    <pointer-type-def type-id='type-id-2884' size-in-bits='64' id='type-id-2872'/>
+    <pointer-type-def type-id='type-id-1153' size-in-bits='64' id='type-id-2876'/>
+    <qualified-type-def type-id='type-id-2874' const='yes' id='type-id-2885'/>
+    <pointer-type-def type-id='type-id-2885' size-in-bits='64' id='type-id-2875'/>
 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++98/parallel_settings.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'>
 
 
     <namespace-decl name='__gnu_parallel'>
-      <class-decl name='_Settings' size-in-bits='2816' 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/parallel/settings.h' line='123' column='1' id='type-id-2887'>
+      <class-decl name='_Settings' size-in-bits='2816' 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/parallel/settings.h' line='123' column='1' id='type-id-2886'>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='algorithm_strategy' type-id='type-id-2888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='125' column='1'/>
+          <var-decl name='algorithm_strategy' type-id='type-id-2887' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='125' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='32'>
-          <var-decl name='sort_algorithm' type-id='type-id-2889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='127' column='1'/>
+          <var-decl name='sort_algorithm' type-id='type-id-2888' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='127' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='64'>
-          <var-decl name='partial_sum_algorithm' type-id='type-id-2890' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='128' column='1'/>
+          <var-decl name='partial_sum_algorithm' type-id='type-id-2889' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='128' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='96'>
-          <var-decl name='multiway_merge_algorithm' type-id='type-id-2891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='129' column='1'/>
+          <var-decl name='multiway_merge_algorithm' type-id='type-id-2890' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='129' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='128'>
-          <var-decl name='find_algorithm' type-id='type-id-2892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='130' column='1'/>
+          <var-decl name='find_algorithm' type-id='type-id-2891' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='130' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='160'>
-          <var-decl name='sort_splitting' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='132' column='1'/>
+          <var-decl name='sort_splitting' type-id='type-id-2892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='132' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='192'>
-          <var-decl name='merge_splitting' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='133' column='1'/>
+          <var-decl name='merge_splitting' type-id='type-id-2892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='133' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='224'>
-          <var-decl name='multiway_merge_splitting' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='134' column='1'/>
+          <var-decl name='multiway_merge_splitting' type-id='type-id-2892' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='134' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='256'>
-          <var-decl name='accumulate_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='139' column='1'/>
+          <var-decl name='accumulate_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='139' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='320'>
           <var-decl name='adjacent_difference_minimal_n' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='142' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='384'>
-          <var-decl name='count_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='145' column='1'/>
+          <var-decl name='count_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='145' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='448'>
-          <var-decl name='fill_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='148' column='1'/>
+          <var-decl name='fill_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='148' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='512'>
           <var-decl name='find_increasing_factor' type-id='type-id-536' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='151' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='576'>
-          <var-decl name='find_initial_block_size' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='154' column='1'/>
+          <var-decl name='find_initial_block_size' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='154' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='640'>
-          <var-decl name='find_maximum_block_size' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='157' column='1'/>
+          <var-decl name='find_maximum_block_size' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='157' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='704'>
-          <var-decl name='find_sequential_search_size' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='160' column='1'/>
+          <var-decl name='find_sequential_search_size' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='160' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='768'>
-          <var-decl name='for_each_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='163' column='1'/>
+          <var-decl name='for_each_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='163' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='832'>
-          <var-decl name='generate_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='166' column='1'/>
+          <var-decl name='generate_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='166' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='896'>
-          <var-decl name='max_element_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='169' column='1'/>
+          <var-decl name='max_element_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='169' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='960'>
-          <var-decl name='merge_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='172' column='1'/>
+          <var-decl name='merge_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='172' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1024'>
           <var-decl name='merge_oversampling' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='175' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1088'>
-          <var-decl name='min_element_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='178' column='1'/>
+          <var-decl name='min_element_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='178' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1152'>
-          <var-decl name='multiway_merge_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='181' column='1'/>
+          <var-decl name='multiway_merge_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='181' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1216'>
           <var-decl name='multiway_merge_minimal_k' type-id='type-id-36' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='184' column='1'/>
@@ -43468,19 +43467,19 @@
           <var-decl name='multiway_merge_oversampling' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='187' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1280'>
-          <var-decl name='nth_element_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='190' column='1'/>
+          <var-decl name='nth_element_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='190' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1344'>
-          <var-decl name='partition_chunk_size' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='193' column='1'/>
+          <var-decl name='partition_chunk_size' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='193' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1408'>
           <var-decl name='partition_chunk_share' type-id='type-id-536' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='197' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1472'>
-          <var-decl name='partition_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='200' column='1'/>
+          <var-decl name='partition_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='200' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1536'>
-          <var-decl name='partial_sort_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='203' column='1'/>
+          <var-decl name='partial_sort_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='203' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1600'>
           <var-decl name='partial_sum_dilation' type-id='type-id-538' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='207' column='1'/>
@@ -43492,22 +43491,22 @@
           <var-decl name='random_shuffle_minimal_n' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='213' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1728'>
-          <var-decl name='replace_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='216' column='1'/>
+          <var-decl name='replace_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='216' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1792'>
-          <var-decl name='set_difference_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='219' column='1'/>
+          <var-decl name='set_difference_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='219' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1856'>
-          <var-decl name='set_intersection_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='222' column='1'/>
+          <var-decl name='set_intersection_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='222' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1920'>
-          <var-decl name='set_symmetric_difference_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='225' column='1'/>
+          <var-decl name='set_symmetric_difference_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='225' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='1984'>
-          <var-decl name='set_union_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='228' column='1'/>
+          <var-decl name='set_union_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='228' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2048'>
-          <var-decl name='sort_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='231' column='1'/>
+          <var-decl name='sort_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='231' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2112'>
           <var-decl name='sort_mwms_oversampling' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='234' column='1'/>
@@ -43516,16 +43515,16 @@
           <var-decl name='sort_qs_num_samples_preset' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='237' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2176'>
-          <var-decl name='sort_qsb_base_case_maximal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='241' column='1'/>
+          <var-decl name='sort_qsb_base_case_maximal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='241' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2240'>
-          <var-decl name='transform_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='244' column='1'/>
+          <var-decl name='transform_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='244' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2304'>
-          <var-decl name='unique_copy_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='247' column='1'/>
+          <var-decl name='unique_copy_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='247' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2368'>
-          <var-decl name='workstealing_chunk_size' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='249' column='1'/>
+          <var-decl name='workstealing_chunk_size' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='249' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2432'>
           <var-decl name='L1_cache_size' type-id='type-id-541' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='254' column='1'/>
@@ -43540,86 +43539,86 @@
           <var-decl name='cache_line_size' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='265' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2624'>
-          <var-decl name='qsb_steals' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='270' column='1'/>
+          <var-decl name='qsb_steals' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='270' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2688'>
-          <var-decl name='search_minimal_n' type-id='type-id-2894' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='273' column='1'/>
+          <var-decl name='search_minimal_n' type-id='type-id-2893' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='273' column='1'/>
         </data-member>
         <data-member access='public' layout-offset-in-bits='2752'>
           <var-decl name='find_scale_factor' type-id='type-id-538' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='276' column='1'/>
         </data-member>
         <member-function access='public' static='yes'>
           <function-decl name='get' mangled-name='_ZN14__gnu_parallel9_Settings3getEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14__gnu_parallel9_Settings3getEv@@GLIBCXX_3.4.10'>
-            <return type-id='type-id-2895'/>
+            <return type-id='type-id-2894'/>
           </function-decl>
         </member-function>
         <member-function access='public' static='yes'>
           <function-decl name='set' mangled-name='_ZN14__gnu_parallel9_Settings3setERS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN14__gnu_parallel9_Settings3setERS0_@@GLIBCXX_3.4.10'>
-            <parameter type-id='type-id-2896'/>
+            <parameter type-id='type-id-2895'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' constructor='yes'>
           <function-decl name='_Settings' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/settings.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2897' is-artificial='yes'/>
+            <parameter type-id='type-id-2896' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='_AlgorithmStrategy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='67' column='1' id='type-id-2888'>
+      <enum-decl name='_AlgorithmStrategy' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='67' column='1' id='type-id-2887'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='heuristic' value='0'/>
         <enumerator name='force_sequential' value='1'/>
         <enumerator name='force_parallel' value='2'/>
       </enum-decl>
-      <enum-decl name='_SortAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='76' column='1' id='type-id-2889'>
+      <enum-decl name='_SortAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='76' column='1' id='type-id-2888'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='MWMS' value='0'/>
         <enumerator name='QS' value='1'/>
         <enumerator name='QS_BALANCED' value='2'/>
       </enum-decl>
-      <enum-decl name='_PartialSumAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='91' column='1' id='type-id-2890'>
+      <enum-decl name='_PartialSumAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='91' column='1' id='type-id-2889'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='RECURSIVE' value='0'/>
         <enumerator name='LINEAR' value='1'/>
       </enum-decl>
-      <enum-decl name='_MultiwayMergeAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='85' column='1' id='type-id-2891'>
+      <enum-decl name='_MultiwayMergeAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='85' column='1' id='type-id-2890'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='LOSER_TREE' value='0'/>
       </enum-decl>
-      <enum-decl name='_FindAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='106' column='1' id='type-id-2892'>
+      <enum-decl name='_FindAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='106' column='1' id='type-id-2891'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='GROWING_BLOCKS' value='0'/>
         <enumerator name='CONSTANT_SIZE_BLOCKS' value='1'/>
         <enumerator name='EQUAL_SPLIT' value='2'/>
       </enum-decl>
-      <enum-decl name='_SplittingAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='98' column='1' id='type-id-2893'>
+      <enum-decl name='_SplittingAlgorithm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='98' column='1' id='type-id-2892'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='SAMPLING' value='0'/>
         <enumerator name='EXACT' value='1'/>
       </enum-decl>
-      <typedef-decl name='_SequenceIndex' type-id='type-id-2898' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='117' column='1' id='type-id-2894'/>
+      <typedef-decl name='_SequenceIndex' type-id='type-id-2897' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/parallel/types.h' line='117' column='1' id='type-id-2893'/>
     </namespace-decl>
 
-    <typedef-decl name='uint64_t' type-id='type-id-69' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-2898'/>
-    <qualified-type-def type-id='type-id-2887' const='yes' id='type-id-2899'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2899' size-in-bits='64' id='type-id-2895'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2887' size-in-bits='64' id='type-id-2896'/>
-    <pointer-type-def type-id='type-id-2887' size-in-bits='64' id='type-id-2897'/>
+    <typedef-decl name='uint64_t' type-id='type-id-69' filepath='/usr/include/stdint.h' line='56' column='1' id='type-id-2897'/>
+    <qualified-type-def type-id='type-id-2886' const='yes' id='type-id-2898'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2898' size-in-bits='64' id='type-id-2894'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2886' size-in-bits='64' id='type-id-2895'/>
+    <pointer-type-def type-id='type-id-2886' size-in-bits='64' id='type-id-2896'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/chrono.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'>
     <namespace-decl name='std'>
       <namespace-decl name='chrono'>
         <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-1255'/>
-          <return type-id='type-id-2900'/>
+          <return type-id='type-id-2899'/>
         </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-1255'/>
           <parameter type-id='type-id-1251'/>
-          <return type-id='type-id-2901'/>
+          <return type-id='type-id-2900'/>
         </function-decl>
-        <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-2902'>
+        <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-2901'>
           <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-1255'/>
@@ -43628,28 +43627,28 @@
           </member-function>
         </class-decl>
       </namespace-decl>
-      <class-decl name='enable_if&lt;true, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt; &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='1723' column='1' id='type-id-2903'>
+      <class-decl name='enable_if&lt;true, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt; &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='1723' column='1' id='type-id-2902'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1240' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1724' column='1' id='type-id-2900'/>
+          <typedef-decl name='type' type-id='type-id-1240' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1724' column='1' id='type-id-2899'/>
         </member-type>
       </class-decl>
-      <class-decl name='common_type&lt;std::chrono::duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt; &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='74' column='1' id='type-id-2904'>
+      <class-decl name='common_type&lt;std::chrono::duration&lt;long int, std::ratio&lt;1l, 1l&gt; &gt;, std::chrono::duration&lt;long int, std::ratio&lt;1l, 1000000l&gt; &gt; &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='74' column='1' id='type-id-2903'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1240' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='85' column='1' id='type-id-2901'/>
+          <typedef-decl name='type' type-id='type-id-1240' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/chrono' line='85' column='1' id='type-id-2900'/>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-2905'>
+    <class-decl name='timeval' size-in-bits='128' is-struct='yes' visibility='default' filepath='/usr/include/bits/time.h' line='75' column='1' id='type-id-2904'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tv_sec' type-id='type-id-1245' visibility='default' filepath='/usr/include/bits/time.h' line='77' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_usec' type-id='type-id-2906' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
+        <var-decl name='tv_usec' type-id='type-id-2905' visibility='default' filepath='/usr/include/bits/time.h' line='78' column='1'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__suseconds_t' type-id='type-id-55' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-2906'/>
-    <pointer-type-def type-id='type-id-2905' size-in-bits='64' id='type-id-2907'/>
-    <class-decl name='timezone' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/sys/time.h' line='57' column='1' id='type-id-2908'>
+    <typedef-decl name='__suseconds_t' type-id='type-id-55' filepath='/usr/include/bits/types.h' line='151' column='1' id='type-id-2905'/>
+    <pointer-type-def type-id='type-id-2904' size-in-bits='64' id='type-id-2906'/>
+    <class-decl name='timezone' size-in-bits='64' is-struct='yes' visibility='default' filepath='/usr/include/sys/time.h' line='57' column='1' id='type-id-2907'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tz_minuteswest' type-id='type-id-36' visibility='default' filepath='/usr/include/sys/time.h' line='59' column='1'/>
       </data-member>
@@ -43657,10 +43656,10 @@
         <var-decl name='tz_dsttime' type-id='type-id-36' visibility='default' filepath='/usr/include/sys/time.h' line='60' column='1'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-2908' size-in-bits='64' id='type-id-2909'/>
+    <pointer-type-def type-id='type-id-2907' size-in-bits='64' id='type-id-2908'/>
     <function-decl name='gettimeofday' filepath='/usr/include/sys/time.h' line='73' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-2907'/>
-      <parameter type-id='type-id-2909'/>
+      <parameter type-id='type-id-2906'/>
+      <parameter type-id='type-id-2908'/>
       <return type-id='type-id-36'/>
     </function-decl>
   </abi-instr>
@@ -43669,7 +43668,7 @@
 
 
 
-      <class-decl name='condition_variable_any' size-in-bits='704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='173' column='1' id='type-id-2910'>
+      <class-decl name='condition_variable_any' size-in-bits='704' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='173' column='1' id='type-id-2909'>
         <data-member access='private' layout-offset-in-bits='0'>
           <var-decl name='_M_cond' type-id='type-id-1450' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='176' column='1'/>
         </data-member>
@@ -43678,52 +43677,52 @@
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='condition_variable_any' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~condition_variable_any' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='condition_variable_any' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='204' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
-            <parameter type-id='type-id-2912'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
+            <parameter type-id='type-id-2911'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt22condition_variable_anyaSERKS_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
-            <parameter type-id='type-id-2912'/>
-            <return type-id='type-id-2913'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
+            <parameter type-id='type-id-2911'/>
+            <return type-id='type-id-2912'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='notify_one' mangled-name='_ZNSt22condition_variable_any10notify_oneEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='notify_all' mangled-name='_ZNSt22condition_variable_any10notify_allEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='condition_variable_any' mangled-name='_ZNSt22condition_variable_anyC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt22condition_variable_anyC2Ev@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~condition_variable_any' mangled-name='_ZNSt22condition_variable_anyD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/condition_variable' line='202' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt22condition_variable_anyD1Ev@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-2911' is-artificial='yes'/>
+            <parameter type-id='type-id-2910' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -43733,236 +43732,236 @@
 
 
 
-    <pointer-type-def type-id='type-id-2910' size-in-bits='64' id='type-id-2911'/>
-    <qualified-type-def type-id='type-id-2910' const='yes' id='type-id-2914'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2914' size-in-bits='64' id='type-id-2912'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2910' size-in-bits='64' id='type-id-2913'/>
+    <pointer-type-def type-id='type-id-2909' size-in-bits='64' id='type-id-2910'/>
+    <qualified-type-def type-id='type-id-2909' const='yes' id='type-id-2913'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2913' size-in-bits='64' id='type-id-2911'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2909' size-in-bits='64' id='type-id-2912'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/debug.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'>
     <namespace-decl name='__gnu_debug'>
-      <class-decl name='_Safe_iterator_base' 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/debug/safe_base.h' line='51' column='1' id='type-id-2915'>
+      <class-decl name='_Safe_iterator_base' 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/debug/safe_base.h' line='51' column='1' id='type-id-2914'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_sequence' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='56' column='1'/>
+          <var-decl name='_M_sequence' type-id='type-id-2915' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='56' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
           <var-decl name='_M_version' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='65' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_prior' type-id='type-id-2917' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='69' column='1'/>
+          <var-decl name='_M_prior' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='69' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_next' type-id='type-id-2917' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='73' column='1'/>
+          <var-decl name='_M_next' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='73' column='1'/>
         </data-member>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='77' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='88' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
-            <parameter type-id='type-id-2918'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2917'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='95' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
-            <parameter type-id='type-id-2919'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2918'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='operator=' mangled-name='_ZN11__gnu_debug19_Safe_iterator_baseaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='100' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
-            <parameter type-id='type-id-2919'/>
-            <return type-id='type-id-2920'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2918'/>
+            <return type-id='type-id-2919'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
-            <parameter type-id='type-id-2919'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2918'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes'>
           <function-decl name='~_Safe_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='105' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_mutex' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base12_M_get_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base12_M_get_mutexEv@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-1793'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
-            <parameter type-id='type-id-2916'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach_single' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
-            <parameter type-id='type-id-2916'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base9_M_detachEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base9_M_detachEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach_single' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base16_M_detach_singleEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_iterator_base16_M_detach_singleEv@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_attached_to' mangled-name='_ZNK11__gnu_debug19_Safe_iterator_base14_M_attached_toEPKNS_19_Safe_sequence_baseE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='130' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2921' is-artificial='yes'/>
-            <parameter type-id='type-id-2918'/>
+            <parameter type-id='type-id-2920' is-artificial='yes'/>
+            <parameter type-id='type-id-2917'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_singular' mangled-name='_ZNK11__gnu_debug19_Safe_iterator_base11_M_singularEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug19_Safe_iterator_base11_M_singularEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2921' is-artificial='yes'/>
+            <parameter type-id='type-id-2920' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_can_compare' mangled-name='_ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug19_Safe_iterator_base14_M_can_compareERKS0_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2921' is-artificial='yes'/>
-            <parameter type-id='type-id-2919'/>
+            <parameter type-id='type-id-2920' is-artificial='yes'/>
+            <parameter type-id='type-id-2918'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_invalidate' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base13_M_invalidateEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_reset' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base8_M_resetEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='148' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_unlink' mangled-name='_ZN11__gnu_debug19_Safe_iterator_base9_M_unlinkEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2917' is-artificial='yes'/>
+            <parameter type-id='type-id-2916' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Safe_sequence_base' 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/debug/safe_base.h' line='178' column='1' id='type-id-2922'>
+      <class-decl name='_Safe_sequence_base' 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/debug/safe_base.h' line='178' column='1' id='type-id-2921'>
         <data-member access='private' layout-offset-in-bits='0'>
-          <var-decl name='_M_iterators' type-id='type-id-2917' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='182' column='1'/>
+          <var-decl name='_M_iterators' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='182' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_const_iterators' type-id='type-id-2917' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='185' column='1'/>
+          <var-decl name='_M_const_iterators' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='185' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_version' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='188' column='1'/>
         </data-member>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_sequence_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes'>
           <function-decl name='~_Safe_sequence_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='198' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_detach_all' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base13_M_detach_allEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_sequence_base13_M_detach_allEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_detach_singular' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base18_M_detach_singularEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_sequence_base18_M_detach_singularEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_revalidate_singular' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base22_M_revalidate_singularEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_sequence_base22_M_revalidate_singularEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base7_M_swapERS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_sequence_base7_M_swapERS0_@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
-            <parameter type-id='type-id-2923'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
+            <parameter type-id='type-id-2922'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_mutex' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug19_Safe_sequence_base12_M_get_mutexEv@@GLIBCXX_3.4.9'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
             <return type-id='type-id-1793'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_invalidate_all' mangled-name='_ZNK11__gnu_debug19_Safe_sequence_base17_M_invalidate_allEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='234' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2918' is-artificial='yes'/>
+            <parameter type-id='type-id-2917' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base9_M_attachEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='239' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach_single' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base16_M_attach_singleEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='243' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base9_M_detachEPNS_19_Safe_iterator_baseE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach_single' mangled-name='_ZN11__gnu_debug19_Safe_sequence_base16_M_detach_singleEPNS_19_Safe_iterator_baseE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_base.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2916' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2915' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Error_formatter' size-in-bits='4480' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='115' column='1' id='type-id-2924'>
+      <class-decl name='_Error_formatter' size-in-bits='4480' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='115' column='1' id='type-id-2923'>
         <member-type access='private'>
-          <enum-decl name='_Constness' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='118' column='1' id='type-id-2925'>
+          <enum-decl name='_Constness' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='118' column='1' id='type-id-2924'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='__unknown_constness' value='0'/>
             <enumerator name='__const_iterator' value='1'/>
@@ -43971,7 +43970,7 @@
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <enum-decl name='_Iterator_state' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='127' column='1' id='type-id-2926'>
+          <enum-decl name='_Iterator_state' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='127' column='1' id='type-id-2925'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='__unknown_state' value='0'/>
             <enumerator name='__singular' value='1'/>
@@ -43983,9 +43982,9 @@
           </enum-decl>
         </member-type>
         <member-type access='private'>
-          <class-decl name='_Parameter' size-in-bits='448' 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/debug/formatter.h' line='143' column='1' id='type-id-2927'>
+          <class-decl name='_Parameter' size-in-bits='448' 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/debug/formatter.h' line='143' column='1' id='type-id-2926'>
             <member-type access='public'>
-              <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/debug/formatter.h' line='146' column='1' id='type-id-2928'>
+              <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/debug/formatter.h' line='146' column='1' id='type-id-2927'>
                 <underlying-type type-id='type-id-6'/>
                 <enumerator name='__unused_param' value='0'/>
                 <enumerator name='__iterator' value='1'/>
@@ -43995,9 +43994,9 @@
               </enum-decl>
             </member-type>
             <member-type access='public'>
-              <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='155' column='1' id='type-id-2929'>
+              <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='155' column='1' id='type-id-2928'>
                 <member-type access='private'>
-                  <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='158' column='1' id='type-id-2930'>
+                  <class-decl name='__anonymous_struct__' size-in-bits='384' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='158' column='1' id='type-id-2929'>
                     <data-member access='public' layout-offset-in-bits='0'>
                       <var-decl name='_M_name' type-id='type-id-11' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='159' column='1'/>
                     </data-member>
@@ -44008,10 +44007,10 @@
                       <var-decl name='_M_type' type-id='type-id-1354' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='161' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='192'>
-                      <var-decl name='_M_constness' type-id='type-id-2925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='162' column='1'/>
+                      <var-decl name='_M_constness' type-id='type-id-2924' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='162' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='224'>
-                      <var-decl name='_M_state' type-id='type-id-2926' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='163' column='1'/>
+                      <var-decl name='_M_state' type-id='type-id-2925' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='163' column='1'/>
                     </data-member>
                     <data-member access='public' layout-offset-in-bits='256'>
                       <var-decl name='_M_sequence' type-id='type-id-33' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='164' column='1'/>
@@ -44022,7 +44021,7 @@
                   </class-decl>
                 </member-type>
                 <member-type access='private'>
-                  <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='170' column='1' id='type-id-2931'>
+                  <class-decl name='__anonymous_struct__' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='170' column='1' id='type-id-2930'>
                     <data-member access='public' layout-offset-in-bits='0'>
                       <var-decl name='_M_name' type-id='type-id-11' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='171' column='1'/>
                     </data-member>
@@ -44035,7 +44034,7 @@
                   </class-decl>
                 </member-type>
                 <member-type access='private'>
-                  <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='178' column='1' id='type-id-2932'>
+                  <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='178' column='1' id='type-id-2931'>
                     <data-member access='public' layout-offset-in-bits='0'>
                       <var-decl name='_M_name' type-id='type-id-11' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='179' column='1'/>
                     </data-member>
@@ -44045,7 +44044,7 @@
                   </class-decl>
                 </member-type>
                 <member-type access='private'>
-                  <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='185' column='1' id='type-id-2933'>
+                  <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='185' column='1' id='type-id-2932'>
                     <data-member access='public' layout-offset-in-bits='0'>
                       <var-decl name='_M_name' type-id='type-id-11' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='186' column='1'/>
                     </data-member>
@@ -44055,34 +44054,34 @@
                   </class-decl>
                 </member-type>
                 <data-member access='private'>
-                  <var-decl name='_M_iterator' type-id='type-id-2930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='166' column='1'/>
+                  <var-decl name='_M_iterator' type-id='type-id-2929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='166' column='1'/>
                 </data-member>
                 <data-member access='private'>
-                  <var-decl name='_M_sequence' type-id='type-id-2931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='174' column='1'/>
+                  <var-decl name='_M_sequence' type-id='type-id-2930' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='174' column='1'/>
                 </data-member>
                 <data-member access='private'>
-                  <var-decl name='_M_integer' type-id='type-id-2932' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='181' column='1'/>
+                  <var-decl name='_M_integer' type-id='type-id-2931' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='181' column='1'/>
                 </data-member>
                 <data-member access='private'>
-                  <var-decl name='_M_string' type-id='type-id-2933' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='188' column='1'/>
+                  <var-decl name='_M_string' type-id='type-id-2932' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='188' column='1'/>
                 </data-member>
               </union-decl>
             </member-type>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_kind' type-id='type-id-2928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='152' column='1'/>
+              <var-decl name='_M_kind' type-id='type-id-2927' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='152' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_variant' type-id='type-id-2929' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='189' column='1'/>
+              <var-decl name='_M_variant' type-id='type-id-2928' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='189' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Parameter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2934' is-artificial='yes'/>
+                <parameter type-id='type-id-2933' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Parameter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2934' is-artificial='yes'/>
+                <parameter type-id='type-id-2933' is-artificial='yes'/>
                 <parameter type-id='type-id-55'/>
                 <parameter type-id='type-id-11'/>
                 <return type-id='type-id-4'/>
@@ -44090,7 +44089,7 @@
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Parameter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-2934' is-artificial='yes'/>
+                <parameter type-id='type-id-2933' is-artificial='yes'/>
                 <parameter type-id='type-id-11'/>
                 <parameter type-id='type-id-11'/>
                 <return type-id='type-id-4'/>
@@ -44098,23 +44097,23 @@
             </member-function>
             <member-function access='public' const='yes'>
               <function-decl name='_M_print_field' mangled-name='_ZNK11__gnu_debug16_Error_formatter10_Parameter14_M_print_fieldEPKS0_PKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter10_Parameter14_M_print_fieldEPKS0_PKc@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-2935' is-artificial='yes'/>
-                <parameter type-id='type-id-2936'/>
+                <parameter type-id='type-id-2934' is-artificial='yes'/>
+                <parameter type-id='type-id-2935'/>
                 <parameter type-id='type-id-11'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public' const='yes'>
               <function-decl name='_M_print_description' mangled-name='_ZNK11__gnu_debug16_Error_formatter10_Parameter20_M_print_descriptionEPKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter10_Parameter20_M_print_descriptionEPKS0_@@GLIBCXX_3.4'>
-                <parameter type-id='type-id-2935' is-artificial='yes'/>
-                <parameter type-id='type-id-2936'/>
+                <parameter type-id='type-id-2934' is-artificial='yes'/>
+                <parameter type-id='type-id-2935'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
           </class-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/debug/formatter.h' line='445' column='1' id='type-id-2937'>
+          <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/debug/formatter.h' line='445' column='1' id='type-id-2936'>
             <underlying-type type-id='type-id-6'/>
             <enumerator name='_M_indent' value='4'/>
           </enum-decl>
@@ -44126,7 +44125,7 @@
           <var-decl name='_M_line' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='440' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_parameters' type-id='type-id-2938' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='441' column='1'/>
+          <var-decl name='_M_parameters' type-id='type-id-2937' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='441' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='4160'>
           <var-decl name='_M_num_parameters' type-id='type-id-66' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='442' column='1'/>
@@ -44148,43 +44147,43 @@
         </data-member>
         <member-function access='private' const='yes'>
           <function-decl name='_M_integer' mangled-name='_ZNK11__gnu_debug16_Error_formatter10_M_integerElPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='383' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-55'/>
             <parameter type-id='type-id-11'/>
-            <return type-id='type-id-2939'/>
+            <return type-id='type-id-2938'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_string' mangled-name='_ZNK11__gnu_debug16_Error_formatter9_M_stringEPKcS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='391' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-11'/>
-            <return type-id='type-id-2939'/>
+            <return type-id='type-id-2938'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_message' mangled-name='_ZNK11__gnu_debug16_Error_formatter10_M_messageEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='409' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
-            <return type-id='type-id-2939'/>
+            <return type-id='type-id-2938'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_message' mangled-name='_ZNK11__gnu_debug16_Error_formatter10_M_messageENS_13_Debug_msg_idE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='413' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter10_M_messageENS_13_Debug_msg_idE@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
-            <parameter type-id='type-id-2940'/>
-            <return type-id='type-id-2939'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
+            <parameter type-id='type-id-2939'/>
+            <return type-id='type-id-2938'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_error' mangled-name='_ZNK11__gnu_debug16_Error_formatter8_M_errorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter8_M_errorEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='_Error_formatter' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='419' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2941' is-artificial='yes'/>
+            <parameter type-id='type-id-2940' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
@@ -44192,21 +44191,21 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_print_word' mangled-name='_ZNK11__gnu_debug16_Error_formatter13_M_print_wordEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter13_M_print_wordEPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_print_string' mangled-name='_ZNK11__gnu_debug16_Error_formatter15_M_print_stringEPKc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter15_M_print_stringEPKc@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_get_max_length' mangled-name='_ZNK11__gnu_debug16_Error_formatter17_M_get_max_lengthEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNK11__gnu_debug16_Error_formatter17_M_get_max_lengthEv@@GLIBCXX_3.4.10'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
@@ -44214,12 +44213,12 @@
           <function-decl name='_M_at' mangled-name='_ZN11__gnu_debug16_Error_formatter5_M_atEPKcm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='452' column='1' visibility='default' binding='global' size-in-bits='64'>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-66'/>
-            <return type-id='type-id-2924'/>
+            <return type-id='type-id-2923'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;const void*&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordIPKvEEvPciPKcT_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-11'/>
@@ -44229,7 +44228,7 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;const char*&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordIPKcEEvPciS3_T_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-11'/>
@@ -44239,7 +44238,7 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;long unsigned int&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordImEEvPciPKcT_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-11'/>
@@ -44249,7 +44248,7 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_format_word&lt;long int&gt;' mangled-name='_ZNK11__gnu_debug16_Error_formatter14_M_format_wordIlEEvPciPKcT_' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='782' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2936' is-artificial='yes'/>
+            <parameter type-id='type-id-2935' is-artificial='yes'/>
             <parameter type-id='type-id-149'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-11'/>
@@ -44258,7 +44257,7 @@
           </function-decl>
         </member-function>
       </class-decl>
-      <enum-decl name='_Debug_msg_id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='55' column='1' id='type-id-2940'>
+      <enum-decl name='_Debug_msg_id' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/formatter.h' line='55' column='1' id='type-id-2939'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='__msg_valid_range' value='0'/>
         <enumerator name='__msg_insert_singular' value='1'/>
@@ -44308,179 +44307,179 @@
         <enumerator name='__msg_local_iter_compare_bad' value='45'/>
         <enumerator name='__msg_non_empty_range' value='46'/>
       </enum-decl>
-      <class-decl name='_Safe_local_iterator_base' 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/debug/safe_unordered_base.h' line='50' column='1' id='type-id-2942'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2915'/>
+      <class-decl name='_Safe_local_iterator_base' 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/debug/safe_unordered_base.h' line='50' column='1' id='type-id-2941'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2914'/>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='54' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='64' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
-            <parameter type-id='type-id-2918'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2917'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='70' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
-            <parameter type-id='type-id-2944'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2943'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='operator=' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_baseaSERKS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
-            <parameter type-id='type-id-2944'/>
-            <return type-id='type-id-2945'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2943'/>
+            <return type-id='type-id-2944'/>
           </function-decl>
         </member-function>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='78' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
-            <parameter type-id='type-id-2944'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2943'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes'>
           <function-decl name='~_Safe_local_iterator_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='80' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_get_container' mangled-name='_ZNK11__gnu_debug25_Safe_local_iterator_base16_M_get_containerEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2946' is-artificial='yes'/>
-            <return type-id='type-id-2947'/>
+            <parameter type-id='type-id-2945' is-artificial='yes'/>
+            <return type-id='type-id-2946'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug25_Safe_local_iterator_base9_M_attachEPNS_19_Safe_sequence_baseEb@@GLIBCXX_3.4.17'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
-            <parameter type-id='type-id-2916'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2915'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach_single' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_base16_M_attach_singleEPNS_19_Safe_sequence_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
-            <parameter type-id='type-id-2916'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
+            <parameter type-id='type-id-2915'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_base9_M_detachEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='99' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug25_Safe_local_iterator_base9_M_detachEv@@GLIBCXX_3.4.17'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach_single' mangled-name='_ZN11__gnu_debug25_Safe_local_iterator_base16_M_detach_singleEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2943' is-artificial='yes'/>
+            <parameter type-id='type-id-2942' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Safe_unordered_container_base' 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/debug/safe_unordered_base.h' line='123' column='1' id='type-id-2948'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2922'/>
+      <class-decl name='_Safe_unordered_container_base' 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/debug/safe_unordered_base.h' line='123' column='1' id='type-id-2947'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2921'/>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_local_iterators' type-id='type-id-2917' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='128' column='1'/>
+          <var-decl name='_M_local_iterators' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='128' column='1'/>
         </data-member>
         <data-member access='private' layout-offset-in-bits='256'>
-          <var-decl name='_M_const_local_iterators' type-id='type-id-2917' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='131' column='1'/>
+          <var-decl name='_M_const_local_iterators' type-id='type-id-2916' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='131' column='1'/>
         </data-member>
         <member-function access='protected' constructor='yes'>
           <function-decl name='_Safe_unordered_container_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected' destructor='yes'>
           <function-decl name='~_Safe_unordered_container_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_detach_all' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base13_M_detach_allEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug30_Safe_unordered_container_base13_M_detach_allEv@@GLIBCXX_3.4.17'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_swap' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base7_M_swapERS0_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZN11__gnu_debug30_Safe_unordered_container_base7_M_swapERS0_@@GLIBCXX_3.4.17'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
-            <parameter type-id='type-id-2949'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
+            <parameter type-id='type-id-2948'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach_local' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base15_M_attach_localEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_attach_local_single' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base22_M_attach_local_singleEPNS_19_Safe_iterator_baseEb' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='163' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <parameter type-id='type-id-23'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach_local' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base15_M_detach_localEPNS_19_Safe_iterator_baseE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_detach_local_single' mangled-name='_ZN11__gnu_debug30_Safe_unordered_container_base22_M_detach_local_singleEPNS_19_Safe_iterator_baseE' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/debug/safe_unordered_base.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2947' is-artificial='yes'/>
-            <parameter type-id='type-id-2917'/>
+            <parameter type-id='type-id-2946' is-artificial='yes'/>
+            <parameter type-id='type-id-2916'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <var-decl name='_S_debug_messages' type-id='type-id-2950' mangled-name='_ZN11__gnu_debug17_S_debug_messagesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='105' column='1'/>
+      <var-decl name='_S_debug_messages' type-id='type-id-2949' mangled-name='_ZN11__gnu_debug17_S_debug_messagesE' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/debug.cc' line='105' column='1'/>
     </namespace-decl>
     <namespace-decl name='std'>
 
 
 
-      <class-decl name='remove_reference&lt;__gnu_debug::_Safe_iterator_base*&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/type_traits' line='1330' column='1' id='type-id-2951'>
+      <class-decl name='remove_reference&lt;__gnu_debug::_Safe_iterator_base*&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/type_traits' line='1330' column='1' id='type-id-2950'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-2917' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-2952'/>
+          <typedef-decl name='type' type-id='type-id-2916' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-2951'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;__gnu_debug::_Safe_iterator_base*&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-2953'/>
-        <return type-id='type-id-2954'/>
+        <parameter type-id='type-id-2952'/>
+        <return type-id='type-id-2953'/>
       </function-decl>
       <function-decl name='swap&lt;__gnu_debug::_Safe_iterator_base*&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-2953'/>
-        <parameter type-id='type-id-2953'/>
+        <parameter type-id='type-id-2952'/>
+        <parameter type-id='type-id-2952'/>
         <return type-id='type-id-4'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;unsigned int&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/type_traits' line='1330' column='1' id='type-id-2955'>
+      <class-decl name='remove_reference&lt;unsigned int&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/type_traits' line='1330' column='1' id='type-id-2954'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-502' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-2956'/>
+          <typedef-decl name='type' type-id='type-id-502' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-2955'/>
         </member-type>
       </class-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-314'/>
-        <return type-id='type-id-2957'/>
+        <return type-id='type-id-2956'/>
       </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-314'/>
@@ -44489,42 +44488,42 @@
       </function-decl>
 
     </namespace-decl>
-    <pointer-type-def type-id='type-id-2915' size-in-bits='64' id='type-id-2917'/>
-    <pointer-type-def type-id='type-id-2922' size-in-bits='64' id='type-id-2916'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2922' size-in-bits='64' id='type-id-2923'/>
+    <pointer-type-def type-id='type-id-2914' size-in-bits='64' id='type-id-2916'/>
+    <pointer-type-def type-id='type-id-2921' size-in-bits='64' id='type-id-2915'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2921' size-in-bits='64' id='type-id-2922'/>
 
-    <qualified-type-def type-id='type-id-2922' const='yes' id='type-id-2958'/>
-    <pointer-type-def type-id='type-id-2958' size-in-bits='64' id='type-id-2918'/>
-    <qualified-type-def type-id='type-id-2915' const='yes' id='type-id-2959'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2959' size-in-bits='64' id='type-id-2919'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2915' size-in-bits='64' id='type-id-2920'/>
-    <pointer-type-def type-id='type-id-2959' size-in-bits='64' id='type-id-2921'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2952' size-in-bits='64' id='type-id-2954'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2917' size-in-bits='64' id='type-id-2953'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2956' size-in-bits='64' id='type-id-2957'/>
+    <qualified-type-def type-id='type-id-2921' const='yes' id='type-id-2957'/>
+    <pointer-type-def type-id='type-id-2957' size-in-bits='64' id='type-id-2917'/>
+    <qualified-type-def type-id='type-id-2914' const='yes' id='type-id-2958'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2958' size-in-bits='64' id='type-id-2918'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2914' size-in-bits='64' id='type-id-2919'/>
+    <pointer-type-def type-id='type-id-2958' size-in-bits='64' id='type-id-2920'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2951' size-in-bits='64' id='type-id-2953'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2916' size-in-bits='64' id='type-id-2952'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2955' size-in-bits='64' id='type-id-2956'/>
 
-    <pointer-type-def type-id='type-id-2927' size-in-bits='64' id='type-id-2934'/>
-    <qualified-type-def type-id='type-id-2927' const='yes' id='type-id-2960'/>
+    <pointer-type-def type-id='type-id-2926' size-in-bits='64' id='type-id-2933'/>
+    <qualified-type-def type-id='type-id-2926' const='yes' id='type-id-2959'/>
+    <pointer-type-def type-id='type-id-2959' size-in-bits='64' id='type-id-2934'/>
+    <qualified-type-def type-id='type-id-2923' const='yes' id='type-id-2960'/>
     <pointer-type-def type-id='type-id-2960' size-in-bits='64' id='type-id-2935'/>
-    <qualified-type-def type-id='type-id-2924' const='yes' id='type-id-2961'/>
-    <pointer-type-def type-id='type-id-2961' size-in-bits='64' id='type-id-2936'/>
 
-    <array-type-def dimensions='1' type-id='type-id-2927' size-in-bits='4032' id='type-id-2938'>
-      <subrange length='9' type-id='type-id-515' id='type-id-2962'/>
+    <array-type-def dimensions='1' type-id='type-id-2926' size-in-bits='4032' id='type-id-2937'>
+      <subrange length='9' type-id='type-id-515' id='type-id-2961'/>
 
     </array-type-def>
-    <reference-type-def kind='lvalue' type-id='type-id-2961' size-in-bits='64' id='type-id-2939'/>
-    <pointer-type-def type-id='type-id-2924' size-in-bits='64' id='type-id-2941'/>
-    <pointer-type-def type-id='type-id-2942' size-in-bits='64' id='type-id-2943'/>
-    <qualified-type-def type-id='type-id-2942' const='yes' id='type-id-2963'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2963' size-in-bits='64' id='type-id-2944'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2942' size-in-bits='64' id='type-id-2945'/>
-    <pointer-type-def type-id='type-id-2948' size-in-bits='64' id='type-id-2947'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2948' size-in-bits='64' id='type-id-2949'/>
-    <pointer-type-def type-id='type-id-2963' size-in-bits='64' id='type-id-2946'/>
-
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='3008' id='type-id-2950'>
-      <subrange length='47' type-id='type-id-515' id='type-id-2964'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2960' size-in-bits='64' id='type-id-2938'/>
+    <pointer-type-def type-id='type-id-2923' size-in-bits='64' id='type-id-2940'/>
+    <pointer-type-def type-id='type-id-2941' size-in-bits='64' id='type-id-2942'/>
+    <qualified-type-def type-id='type-id-2941' const='yes' id='type-id-2962'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2962' size-in-bits='64' id='type-id-2943'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2941' size-in-bits='64' id='type-id-2944'/>
+    <pointer-type-def type-id='type-id-2947' size-in-bits='64' id='type-id-2946'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2947' size-in-bits='64' id='type-id-2948'/>
+    <pointer-type-def type-id='type-id-2962' size-in-bits='64' id='type-id-2945'/>
+
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='3008' id='type-id-2949'>
+      <subrange length='47' type-id='type-id-515' id='type-id-2963'/>
 
     </array-type-def>
     <function-decl name='snprintf' filepath='/usr/include/stdio.h' line='385' column='1' visibility='default' binding='global' size-in-bits='64'>
@@ -44557,7 +44556,7 @@
 
 
       <namespace-decl name='regex_constants'>
-        <enum-decl name='error_type' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_error.h' line='44' column='1' id='type-id-2965'>
+        <enum-decl name='error_type' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_error.h' line='44' column='1' id='type-id-2964'>
           <underlying-type type-id='type-id-6'/>
           <enumerator name='_S_error_collate' value='0'/>
           <enumerator name='_S_error_ctype' value='1'/>
@@ -44576,127 +44575,127 @@
         </enum-decl>
       </namespace-decl>
       <namespace-decl name='__regex'>
-        <class-decl name='_State' size-in-bits='640' 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/regex_nfa.h' line='200' column='1' id='type-id-2966'>
+        <class-decl name='_State' size-in-bits='640' 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/regex_nfa.h' line='200' column='1' id='type-id-2965'>
           <member-type access='public'>
-            <typedef-decl name='_OpcodeT' type-id='type-id-36' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='202' column='1' id='type-id-2967'/>
+            <typedef-decl name='_OpcodeT' type-id='type-id-36' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='202' column='1' id='type-id-2966'/>
           </member-type>
           <data-member access='public' layout-offset-in-bits='0'>
-            <var-decl name='_M_opcode' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='204' column='1'/>
+            <var-decl name='_M_opcode' type-id='type-id-2966' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='204' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='32'>
-            <var-decl name='_M_next' type-id='type-id-2968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='205' column='1'/>
+            <var-decl name='_M_next' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='205' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='64'>
-            <var-decl name='_M_alt' type-id='type-id-2968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='206' column='1'/>
+            <var-decl name='_M_alt' type-id='type-id-2967' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='206' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='96'>
             <var-decl name='_M_subexpr' type-id='type-id-502' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='207' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='128'>
-            <var-decl name='_M_tagger' type-id='type-id-2969' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='208' column='1'/>
+            <var-decl name='_M_tagger' type-id='type-id-2968' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='208' column='1'/>
           </data-member>
           <data-member access='public' layout-offset-in-bits='384'>
-            <var-decl name='_M_matches' type-id='type-id-2970' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='209' column='1'/>
+            <var-decl name='_M_matches' type-id='type-id-2969' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='209' column='1'/>
           </data-member>
           <member-function access='public' constructor='yes'>
             <function-decl name='_State' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2971' is-artificial='yes'/>
-              <parameter type-id='type-id-2967'/>
+              <parameter type-id='type-id-2970' is-artificial='yes'/>
+              <parameter type-id='type-id-2966'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='_State' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2971' is-artificial='yes'/>
-              <parameter type-id='type-id-2972'/>
+              <parameter type-id='type-id-2970' is-artificial='yes'/>
+              <parameter type-id='type-id-2971'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='_State' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2971' is-artificial='yes'/>
-              <parameter type-id='type-id-2967'/>
+              <parameter type-id='type-id-2970' is-artificial='yes'/>
+              <parameter type-id='type-id-2966'/>
               <parameter type-id='type-id-502'/>
-              <parameter type-id='type-id-2973'/>
+              <parameter type-id='type-id-2972'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
           <member-function access='public' constructor='yes'>
             <function-decl name='_State' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2971' is-artificial='yes'/>
-              <parameter type-id='type-id-2968'/>
-              <parameter type-id='type-id-2968'/>
+              <parameter type-id='type-id-2970' is-artificial='yes'/>
+              <parameter type-id='type-id-2967'/>
+              <parameter type-id='type-id-2967'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <typedef-decl name='_StateIdT' type-id='type-id-36' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='187' column='1' id='type-id-2968'/>
-        <class-decl name='_PatternCursor' 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/regex_cursor.h' line='38' column='1' id='type-id-2974'>
+        <typedef-decl name='_StateIdT' type-id='type-id-36' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='187' column='1' id='type-id-2967'/>
+        <class-decl name='_PatternCursor' 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/regex_cursor.h' line='38' column='1' id='type-id-2973'>
           <member-function access='public' destructor='yes' vtable-offset='-1'>
             <function-decl name='~_PatternCursor' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_cursor.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2975' is-artificial='yes'/>
+              <parameter type-id='type-id-2974' is-artificial='yes'/>
               <parameter type-id='type-id-36' is-artificial='yes'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
           <member-function access='public' vtable-offset='2'>
             <function-decl name='_M_next' mangled-name='_ZNSt7__regex14_PatternCursor7_M_nextEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_cursor.h' line='41' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2975' is-artificial='yes'/>
+              <parameter type-id='type-id-2974' is-artificial='yes'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
           <member-function access='public' const='yes' vtable-offset='3'>
             <function-decl name='_M_at_end' mangled-name='_ZNKSt7__regex14_PatternCursor9_M_at_endEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_cursor.h' line='42' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2976' is-artificial='yes'/>
+              <parameter type-id='type-id-2975' is-artificial='yes'/>
               <return type-id='type-id-23'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Results' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2977'/>
-        <typedef-decl name='_Tagger' type-id='type-id-2978' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='79' column='1' id='type-id-2969'/>
-        <typedef-decl name='_Matcher' type-id='type-id-2979' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='112' column='1' id='type-id-2970'/>
-        <class-decl name='_Scanner_base' 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/regex_compiler.h' line='37' column='1' id='type-id-2980'>
+        <class-decl name='_Results' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-2976'/>
+        <typedef-decl name='_Tagger' type-id='type-id-2977' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='79' column='1' id='type-id-2968'/>
+        <typedef-decl name='_Matcher' type-id='type-id-2978' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='112' column='1' id='type-id-2969'/>
+        <class-decl name='_Scanner_base' 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/regex_compiler.h' line='37' column='1' id='type-id-2979'>
           <member-type access='public'>
-            <typedef-decl name='_StateT' type-id='type-id-502' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='39' column='1' id='type-id-2981'/>
+            <typedef-decl name='_StateT' type-id='type-id-502' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='39' column='1' id='type-id-2980'/>
           </member-type>
           <data-member access='public' static='yes'>
-            <var-decl name='_S_state_at_start' type-id='type-id-2982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='41' column='1'/>
+            <var-decl name='_S_state_at_start' type-id='type-id-2981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='41' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='_S_state_in_brace' type-id='type-id-2982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='42' column='1'/>
+            <var-decl name='_S_state_in_brace' type-id='type-id-2981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='42' column='1'/>
           </data-member>
           <data-member access='public' static='yes'>
-            <var-decl name='_S_state_in_bracket' type-id='type-id-2982' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='43' column='1'/>
+            <var-decl name='_S_state_in_bracket' type-id='type-id-2981' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='43' column='1'/>
           </data-member>
           <member-function access='public' destructor='yes' vtable-offset='-1'>
             <function-decl name='~_Scanner_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_compiler.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2983' is-artificial='yes'/>
+              <parameter type-id='type-id-2982' is-artificial='yes'/>
               <parameter type-id='type-id-36' is-artificial='yes'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
         </class-decl>
-        <class-decl name='_Automaton' 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/regex_nfa.h' line='38' column='1' id='type-id-2984'>
+        <class-decl name='_Automaton' 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/regex_nfa.h' line='38' column='1' id='type-id-2983'>
           <member-type access='private'>
-            <typedef-decl name='_SizeT' type-id='type-id-502' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='41' column='1' id='type-id-2985'/>
+            <typedef-decl name='_SizeT' type-id='type-id-502' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='41' column='1' id='type-id-2984'/>
           </member-type>
           <member-function access='private' destructor='yes' vtable-offset='-1'>
             <function-decl name='~_Automaton' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='45' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2986' is-artificial='yes'/>
+              <parameter type-id='type-id-2985' is-artificial='yes'/>
               <parameter type-id='type-id-36' is-artificial='yes'/>
               <return type-id='type-id-4'/>
             </function-decl>
           </member-function>
           <member-function access='private' const='yes' vtable-offset='2'>
             <function-decl name='_M_sub_count' mangled-name='_ZNKSt7__regex10_Automaton12_M_sub_countEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_nfa.h' line='48' column='1' visibility='default' binding='global' size-in-bits='64'>
-              <parameter type-id='type-id-2987' is-artificial='yes'/>
-              <return type-id='type-id-2985'/>
+              <parameter type-id='type-id-2986' is-artificial='yes'/>
+              <return type-id='type-id-2984'/>
             </function-decl>
           </member-function>
         </class-decl>
       </namespace-decl>
 
-      <enum-decl name='future_errc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='61' column='1' id='type-id-2988'>
+      <enum-decl name='future_errc' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='61' column='1' id='type-id-2987'>
         <underlying-type type-id='type-id-6'/>
         <enumerator name='future_already_retrieved' value='1'/>
         <enumerator name='promise_already_satisfied' value='2'/>
@@ -44704,221 +44703,221 @@
         <enumerator name='broken_promise' value='4'/>
       </enum-decl>
       <function-decl name='make_error_code' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-2988'/>
+        <parameter type-id='type-id-2987'/>
         <return type-id='type-id-1208'/>
       </function-decl>
-      <class-decl name='function&lt;void(const std::__regex::_PatternCursor&amp;, std::__regex::_Results&amp;)&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/functional' line='2024' column='1' id='type-id-2978'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2989'/>
+      <class-decl name='function&lt;void(const std::__regex::_PatternCursor&amp;, std::__regex::_Results&amp;)&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/functional' line='2024' column='1' id='type-id-2977'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2988'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1569'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-2991' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-2990'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-2990' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-2989'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-2990' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2268' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2989' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2268' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2041' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
-            <parameter type-id='type-id-2993'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-2992'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2068' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
-            <parameter type-id='type-id-2994'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-2993'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEEaSERKS7_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
-            <parameter type-id='type-id-2993'/>
-            <return type-id='type-id-2994'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-2992'/>
+            <return type-id='type-id-2993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEEaSEOS7_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
-            <parameter type-id='type-id-2994'/>
-            <return type-id='type-id-2994'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-2993'/>
+            <return type-id='type-id-2993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEEaSEDn' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
-            <return type-id='type-id-2994'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <return type-id='type-id-2993'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEE4swapERS7_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2992' is-artificial='yes'/>
-            <parameter type-id='type-id-2994'/>
+            <parameter type-id='type-id-2991' is-artificial='yes'/>
+            <parameter type-id='type-id-2993'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2995' is-artificial='yes'/>
+            <parameter type-id='type-id-2994' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEEclES3_S5_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2305' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2995' is-artificial='yes'/>
+            <parameter type-id='type-id-2994' is-artificial='yes'/>
+            <parameter type-id='type-id-2995'/>
             <parameter type-id='type-id-2996'/>
-            <parameter type-id='type-id-2997'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='target_type' mangled-name='_ZNKSt8functionIFvRKNSt7__regex14_PatternCursorERNS0_8_ResultsEEE11target_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2316' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-2995' is-artificial='yes'/>
+            <parameter type-id='type-id-2994' is-artificial='yes'/>
             <return type-id='type-id-1341'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const std::__regex::_PatternCursor&amp;, std::__regex::_Results&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/functional' line='520' column='1' id='type-id-2989'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2998'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;void, const std::__regex::_PatternCursor&amp;, std::__regex::_Results&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/functional' line='520' column='1' id='type-id-2988'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2997'/>
       </class-decl>
-      <class-decl name='binary_function&lt;const std::__regex::_PatternCursor&amp;, std::__regex::_Results&amp;, 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_function.h' line='116' column='1' id='type-id-2998'/>
+      <class-decl name='binary_function&lt;const std::__regex::_PatternCursor&amp;, std::__regex::_Results&amp;, 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_function.h' line='116' column='1' id='type-id-2997'/>
       <class-decl name='_Undefined_class' visibility='default' is-declaration-only='yes' id='type-id-1764'/>
-      <class-decl name='function&lt;bool(const std::__regex::_PatternCursor&amp;)&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/functional' line='2024' column='1' id='type-id-2979'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2999'/>
+      <class-decl name='function&lt;bool(const std::__regex::_PatternCursor&amp;)&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/functional' line='2024' column='1' id='type-id-2978'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2998'/>
         <base-class access='private' layout-offset-in-bits='0' type-id='type-id-1569'/>
         <member-type access='private'>
-          <typedef-decl name='_Invoker_type' type-id='type-id-3001' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-3000'/>
+          <typedef-decl name='_Invoker_type' type-id='type-id-3000' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2267' column='1' id='type-id-2999'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_invoker' type-id='type-id-3000' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2268' column='1'/>
+          <var-decl name='_M_invoker' type-id='type-id-2999' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2268' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2041' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2273' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
-            <parameter type-id='type-id-3003'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
+            <parameter type-id='type-id-3002'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='function' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2068' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
-            <parameter type-id='type-id-3004'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
+            <parameter type-id='type-id-3003'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFbRKNSt7__regex14_PatternCursorEEEaSERKS5_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2110' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
-            <parameter type-id='type-id-3003'/>
-            <return type-id='type-id-3004'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
+            <parameter type-id='type-id-3002'/>
+            <return type-id='type-id-3003'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFbRKNSt7__regex14_PatternCursorEEEaSEOS5_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
-            <parameter type-id='type-id-3004'/>
-            <return type-id='type-id-3004'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
+            <parameter type-id='type-id-3003'/>
+            <return type-id='type-id-3003'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8functionIFbRKNSt7__regex14_PatternCursorEEEaSEDn' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2142' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
-            <return type-id='type-id-3004'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
+            <return type-id='type-id-3003'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt8functionIFbRKNSt7__regex14_PatternCursorEEE4swapERS5_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2195' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3002' is-artificial='yes'/>
-            <parameter type-id='type-id-3004'/>
+            <parameter type-id='type-id-3001' is-artificial='yes'/>
+            <parameter type-id='type-id-3003'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator bool' mangled-name='_ZNKSt8functionIFbRKNSt7__regex14_PatternCursorEEEcvbEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2223' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3005' is-artificial='yes'/>
+            <parameter type-id='type-id-3004' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt8functionIFbRKNSt7__regex14_PatternCursorEEEclES3_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2305' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3005' is-artificial='yes'/>
-            <parameter type-id='type-id-2996'/>
+            <parameter type-id='type-id-3004' is-artificial='yes'/>
+            <parameter type-id='type-id-2995'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='target_type' mangled-name='_ZNKSt8functionIFbRKNSt7__regex14_PatternCursorEEE11target_typeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='2316' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3005' is-artificial='yes'/>
+            <parameter type-id='type-id-3004' is-artificial='yes'/>
             <return type-id='type-id-1341'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Maybe_unary_or_binary_function&lt;bool, const std::__regex::_PatternCursor&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/functional' line='515' column='1' id='type-id-2999'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3006'/>
+      <class-decl name='_Maybe_unary_or_binary_function&lt;bool, const std::__regex::_PatternCursor&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/functional' line='515' column='1' id='type-id-2998'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3005'/>
       </class-decl>
-      <class-decl name='unary_function&lt;const std::__regex::_PatternCursor&amp;, bool&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_function.h' line='103' column='1' id='type-id-3006'/>
+      <class-decl name='unary_function&lt;const std::__regex::_PatternCursor&amp;, bool&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_function.h' line='103' column='1' id='type-id-3005'/>
       <function-decl name='__addressof&lt;std::__regex::_State&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='47' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-3007'/>
-        <return type-id='type-id-2971'/>
+        <parameter type-id='type-id-3006'/>
+        <return type-id='type-id-2970'/>
       </function-decl>
       <function-decl name='_Destroy&lt;std::__regex::_State&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_construct.h' line='94' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-2971'/>
+        <parameter type-id='type-id-2970'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='_Destroy&lt;std::__regex::_State*&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_construct.h' line='124' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-2971'/>
-        <parameter type-id='type-id-2971'/>
+        <parameter type-id='type-id-2970'/>
+        <parameter type-id='type-id-2970'/>
         <return type-id='type-id-4'/>
       </function-decl>
-      <class-decl name='allocator&lt;std::__regex::_State&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-3008'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3009'/>
+      <class-decl name='allocator&lt;std::__regex::_State&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-3007'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3008'/>
         <member-type access='private'>
-          <typedef-decl name='pointer' type-id='type-id-2971' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-3010'/>
+          <typedef-decl name='pointer' type-id='type-id-2970' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='94' column='1' id='type-id-3009'/>
         </member-type>
         <member-type access='private'>
-          <class-decl name='rebind&lt;std::__regex::_State&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/allocator.h' line='101' column='1' id='type-id-3011'>
+          <class-decl name='rebind&lt;std::__regex::_State&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/allocator.h' line='101' column='1' id='type-id-3010'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3008' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='102' column='1' id='type-id-3012'/>
+              <typedef-decl name='other' type-id='type-id-3007' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='102' column='1' id='type-id-3011'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3013' is-artificial='yes'/>
+            <parameter type-id='type-id-3012' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3013' is-artificial='yes'/>
-            <parameter type-id='type-id-3014'/>
+            <parameter type-id='type-id-3012' is-artificial='yes'/>
+            <parameter type-id='type-id-3013'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3013' is-artificial='yes'/>
+            <parameter type-id='type-id-3012' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
       <function-decl name='_Destroy&lt;std::__regex::_State*, std::__regex::_State&gt;' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_construct.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-        <parameter type-id='type-id-2971'/>
-        <parameter type-id='type-id-2971'/>
-        <parameter type-id='type-id-3015'/>
+        <parameter type-id='type-id-2970'/>
+        <parameter type-id='type-id-2970'/>
+        <parameter type-id='type-id-3014'/>
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='__throw_bad_exception' mangled-name='_ZSt21__throw_bad_exceptionv' filepath='../../../.././libstdc++-v3/src/c++11/functexcept.cc' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt21__throw_bad_exceptionv@@GLIBCXX_3.4'>
@@ -44963,1046 +44962,1046 @@
         <return type-id='type-id-4'/>
       </function-decl>
       <function-decl name='__throw_regex_error' mangled-name='_ZSt19__throw_regex_errorNSt15regex_constants10error_typeE' filepath='../../../.././libstdc++-v3/src/c++11/functexcept.cc' line='117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt19__throw_regex_errorNSt15regex_constants10error_typeE@@GLIBCXX_3.4.15'>
-        <parameter type-id='type-id-2965'/>
+        <parameter type-id='type-id-2964'/>
         <return type-id='type-id-4'/>
       </function-decl>
 
       <function-decl name='generic_category' mangled-name='_ZSt16generic_categoryv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZSt16generic_categoryv@@GLIBCXX_3.4.11'>
         <return type-id='type-id-1190'/>
       </function-decl>
-      <class-decl name='bad_function_call' 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/functional' line='1633' column='1' id='type-id-3016'>
+      <class-decl name='bad_function_call' 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/functional' line='1633' column='1' id='type-id-3015'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-86'/>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_function_call' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1633' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3017' is-artificial='yes'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_function_call' mangled-name='_ZNSt17bad_function_callD0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17bad_function_callD0Ev@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3017' is-artificial='yes'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_function_call' mangled-name='_ZNSt17bad_function_callD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/functional' line='1633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt17bad_function_callD1Ev@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3017' is-artificial='yes'/>
+            <parameter type-id='type-id-3016' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree&lt;int, int, std::_Identity&lt;int&gt;, std::less&lt;int&gt;, std::allocator&lt;int&gt; &gt;' size-in-bits='384' 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='332' column='1' id='type-id-3018'>
+      <class-decl name='_Rb_tree&lt;int, int, std::_Identity&lt;int&gt;, std::less&lt;int&gt;, std::allocator&lt;int&gt; &gt;' size-in-bits='384' 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='332' column='1' id='type-id-3017'>
         <member-type access='protected'>
-          <class-decl name='_Rb_tree_impl&lt;std::less&lt;int&gt;, true&gt;' size-in-bits='384' 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='437' column='1' id='type-id-3019'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3020'/>
+          <class-decl name='_Rb_tree_impl&lt;std::less&lt;int&gt;, true&gt;' size-in-bits='384' 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='437' column='1' id='type-id-3018'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3019'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_key_compare' type-id='type-id-3021' 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='439' column='1'/>
+              <var-decl name='_M_key_compare' type-id='type-id-3020' 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='439' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
               <var-decl name='_M_header' type-id='type-id-2392' 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='440' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='320'>
-              <var-decl name='_M_node_count' type-id='type-id-3022' 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='441' column='1'/>
+              <var-decl name='_M_node_count' type-id='type-id-3021' 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='441' column='1'/>
             </data-member>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' 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='443' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3023' is-artificial='yes'/>
+                <parameter type-id='type-id-3022' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' 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='448' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3023' is-artificial='yes'/>
+                <parameter type-id='type-id-3022' is-artificial='yes'/>
+                <parameter type-id='type-id-3023'/>
                 <parameter type-id='type-id-3024'/>
-                <parameter type-id='type-id-3025'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_Rb_tree_impl' 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='454' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3023' is-artificial='yes'/>
-                <parameter type-id='type-id-3024'/>
-                <parameter type-id='type-id-3026'/>
+                <parameter type-id='type-id-3022' is-artificial='yes'/>
+                <parameter type-id='type-id-3023'/>
+                <parameter type-id='type-id-3025'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='private'>
               <function-decl name='_M_initialize' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE13_Rb_tree_implIS3_Lb1EE13_M_initializeEv' 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='462' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3023' is-artificial='yes'/>
+                <parameter type-id='type-id-3022' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='size_type' type-id='type-id-66' 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='350' column='1' id='type-id-3022'/>
+          <typedef-decl name='size_type' type-id='type-id-66' 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='350' column='1' id='type-id-3021'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Node_allocator' type-id='type-id-3028' 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='335' column='1' id='type-id-3027'/>
+          <typedef-decl name='_Node_allocator' type-id='type-id-3027' 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='335' column='1' id='type-id-3026'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='_Base_ptr' type-id='type-id-2394' 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='338' column='1' id='type-id-3029'/>
+          <typedef-decl name='_Base_ptr' type-id='type-id-2394' 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='338' column='1' id='type-id-3028'/>
         </member-type>
         <member-type access='protected'>
-          <typedef-decl name='_Const_Base_ptr' type-id='type-id-2396' 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='339' column='1' id='type-id-3030'/>
+          <typedef-decl name='_Const_Base_ptr' type-id='type-id-2396' 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='339' column='1' id='type-id-3029'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='key_type' type-id='type-id-36' 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='342' column='1' id='type-id-3031'/>
+          <typedef-decl name='key_type' type-id='type-id-36' 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='342' column='1' id='type-id-3030'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='value_type' type-id='type-id-36' 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='343' column='1' id='type-id-3032'/>
+          <typedef-decl name='value_type' type-id='type-id-36' 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='343' column='1' id='type-id-3031'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reference' type-id='type-id-3034' 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='347' column='1' id='type-id-3033'/>
+          <typedef-decl name='const_reference' type-id='type-id-3033' 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='347' column='1' id='type-id-3032'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Link_type' type-id='type-id-3036' 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='348' column='1' id='type-id-3035'/>
+          <typedef-decl name='_Link_type' type-id='type-id-3035' 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='348' column='1' id='type-id-3034'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='_Const_Link_type' type-id='type-id-3038' 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='349' column='1' id='type-id-3037'/>
+          <typedef-decl name='_Const_Link_type' type-id='type-id-3037' 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='349' column='1' id='type-id-3036'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='allocator_type' type-id='type-id-3040' 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='352' column='1' id='type-id-3039'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3039' 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='352' column='1' id='type-id-3038'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='iterator' type-id='type-id-3042' 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='566' column='1' id='type-id-3041'/>
+          <typedef-decl name='iterator' type-id='type-id-3041' 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='566' column='1' id='type-id-3040'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_iterator' type-id='type-id-3044' 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='567' column='1' id='type-id-3043'/>
+          <typedef-decl name='const_iterator' type-id='type-id-3043' 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='567' column='1' id='type-id-3042'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='reverse_iterator' type-id='type-id-3046' 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='569' column='1' id='type-id-3045'/>
+          <typedef-decl name='reverse_iterator' type-id='type-id-3045' 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='569' column='1' id='type-id-3044'/>
         </member-type>
         <member-type access='private'>
-          <typedef-decl name='const_reverse_iterator' type-id='type-id-3048' 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='570' column='1' id='type-id-3047'/>
+          <typedef-decl name='const_reverse_iterator' type-id='type-id-3047' 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='570' column='1' id='type-id-3046'/>
         </member-type>
         <data-member access='protected' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3019' 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='471' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3018' 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='471' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE21_M_get_Node_allocatorEv' 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='355' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3026'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3025'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_get_Node_allocator' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE21_M_get_Node_allocatorEv' 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='359' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3025'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3024'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE13get_allocatorEv' 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='363' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3039'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3038'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_get_node' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11_M_get_nodeEv' 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='368' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_put_node' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11_M_put_nodeEPSt13_Rb_tree_nodeIiE' 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='372' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3034'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_destroy_node' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE15_M_destroy_nodeEPSt13_Rb_tree_nodeIiE' 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='417' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3034'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_clone_node' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE13_M_clone_nodeEPKSt13_Rb_tree_nodeIiE' 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='425' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3037'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3036'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_root' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE7_M_rootEv' 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='475' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3051'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3050'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_root' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE7_M_rootEv' 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='479' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3030'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3029'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_leftmost' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11_M_leftmostEv' 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='483' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3051'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3050'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_leftmost' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11_M_leftmostEv' 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='487' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3030'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3029'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_rightmost' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE12_M_rightmostEv' 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='491' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3051'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3050'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_rightmost' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE12_M_rightmostEv' 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='495' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3030'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3029'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_begin' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_M_beginEv' 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='499' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_begin' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_M_beginEv' 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='503' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3037'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3036'/>
           </function-decl>
         </member-function>
         <member-function access='protected'>
           <function-decl name='_M_end' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE6_M_endEv' 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='510' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='protected' const='yes'>
           <function-decl name='_M_end' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE6_M_endEv' 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='514' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3037'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3036'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_value' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_S_valueEPKSt13_Rb_tree_nodeIiE' 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='518' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3037'/>
-            <return type-id='type-id-3033'/>
+            <parameter type-id='type-id-3036'/>
+            <return type-id='type-id-3032'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE6_S_keyEPKSt13_Rb_tree_nodeIiE' 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='522' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3037'/>
+            <parameter type-id='type-id-3036'/>
             <return type-id='type-id-1185'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE7_S_leftEPSt18_Rb_tree_node_base' 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='526' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3029'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3028'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_left' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE7_S_leftEPKSt18_Rb_tree_node_base' 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='530' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3030'/>
-            <return type-id='type-id-3037'/>
+            <parameter type-id='type-id-3029'/>
+            <return type-id='type-id-3036'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_S_rightEPSt18_Rb_tree_node_base' 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='534' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3029'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3028'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_right' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_S_rightEPKSt18_Rb_tree_node_base' 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='538' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3030'/>
-            <return type-id='type-id-3037'/>
+            <parameter type-id='type-id-3029'/>
+            <return type-id='type-id-3036'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_value' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_S_valueEPKSt18_Rb_tree_node_base' 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='542' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3030'/>
-            <return type-id='type-id-3033'/>
+            <parameter type-id='type-id-3029'/>
+            <return type-id='type-id-3032'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_key' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE6_S_keyEPKSt18_Rb_tree_node_base' 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='546' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3030'/>
+            <parameter type-id='type-id-3029'/>
             <return type-id='type-id-1185'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_minimum' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE10_S_minimumEPSt18_Rb_tree_node_base' 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='550' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3029'/>
-            <return type-id='type-id-3029'/>
+            <parameter type-id='type-id-3028'/>
+            <return type-id='type-id-3028'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_minimum' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE10_S_minimumEPKSt18_Rb_tree_node_base' 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='554' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3030'/>
-            <return type-id='type-id-3030'/>
+            <parameter type-id='type-id-3029'/>
+            <return type-id='type-id-3029'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_maximum' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE10_S_maximumEPSt18_Rb_tree_node_base' 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='558' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3029'/>
-            <return type-id='type-id-3029'/>
+            <parameter type-id='type-id-3028'/>
+            <return type-id='type-id-3028'/>
           </function-decl>
         </member-function>
         <member-function access='protected' static='yes'>
           <function-decl name='_S_maximum' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE10_S_maximumEPKSt18_Rb_tree_node_base' 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='562' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3030'/>
-            <return type-id='type-id-3030'/>
+            <parameter type-id='type-id-3029'/>
+            <return type-id='type-id-3029'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_copy' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE7_M_copyEPKSt13_Rb_tree_nodeIiEPS7_' 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='1040' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3037'/>
-            <parameter type-id='type-id-3035'/>
-            <return type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3036'/>
+            <parameter type-id='type-id-3034'/>
+            <return type-id='type-id-3034'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8_M_eraseEPSt13_Rb_tree_nodeIiE' 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='1076' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3034'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE14_M_lower_boundEPSt13_Rb_tree_nodeIiES8_RKi' 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='1093' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3035'/>
-            <parameter type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3034'/>
+            <parameter type-id='type-id-3034'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3041'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_lower_bound' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE14_M_lower_boundEPKSt13_Rb_tree_nodeIiES9_RKi' 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='1109' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <parameter type-id='type-id-3037'/>
-            <parameter type-id='type-id-3037'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3036'/>
+            <parameter type-id='type-id-3036'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3043'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE14_M_upper_boundEPSt13_Rb_tree_nodeIiES8_RKi' 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='1125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3035'/>
-            <parameter type-id='type-id-3035'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3034'/>
+            <parameter type-id='type-id-3034'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3041'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='_M_upper_bound' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE14_M_upper_boundEPKSt13_Rb_tree_nodeIiES9_RKi' 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='1141' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <parameter type-id='type-id-3037'/>
-            <parameter type-id='type-id-3037'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3036'/>
+            <parameter type-id='type-id-3036'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3043'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' 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='623' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' 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='625' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3024'/>
-            <parameter type-id='type-id-3052'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3023'/>
+            <parameter type-id='type-id-3051'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' 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='629' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3053'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3052'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_Rb_tree' 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='918' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3054'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3053'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~_Rb_tree' 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='645' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='operator=' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEEaSERKS5_' 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='943' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3053'/>
-            <return type-id='type-id-3054'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3052'/>
+            <return type-id='type-id-3053'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='key_comp' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8key_compEv' 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='653' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3021'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3020'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='begin' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5beginEv' 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='657' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='begin' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5beginEv' 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='664' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3043'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='end' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE3endEv' 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='671' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='end' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE3endEv' 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='675' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3043'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rbegin' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE6rbeginEv' 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='682' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3045'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3044'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rbegin' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE6rbeginEv' 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='686' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3047'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3046'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='rend' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE4rendEv' 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='690' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <return type-id='type-id-3045'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <return type-id='type-id-3044'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rend' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE4rendEv' 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='694' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3047'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3046'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='empty' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5emptyEv' 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='698' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='size' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE4sizeEv' 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='702' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3022'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3021'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE8max_sizeEv' 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='706' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <return type-id='type-id-3022'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <return type-id='type-id-3021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='swap' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE4swapERS5_' 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='1218' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3054'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3053'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase_aux' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE12_M_erase_auxESt23_Rb_tree_const_iteratorIiE' 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='1491' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3043'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3042'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_erase_aux' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE12_M_erase_auxESt23_Rb_tree_const_iteratorIiES7_' 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='1505' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3043'/>
-            <parameter type-id='type-id-3043'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3042'/>
+            <parameter type-id='type-id-3042'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5eraseESt23_Rb_tree_const_iteratorIiE' 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='763' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3043'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3042'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5eraseESt17_Rb_tree_iteratorIiE' 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='773' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3041'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3040'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5eraseERKi' 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='1518' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3022'/>
+            <return type-id='type-id-3021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5eraseESt23_Rb_tree_const_iteratorIiES7_' 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='796' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3043'/>
-            <parameter type-id='type-id-3043'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3042'/>
+            <parameter type-id='type-id-3042'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='erase' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5eraseEPKiS7_' 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='1530' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-950'/>
-            <parameter type-id='type-id-950'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-951'/>
+            <parameter type-id='type-id-951'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='clear' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5clearEv' 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='814' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='find' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE4findERKi' 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='1541' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3041'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='find' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE4findERKi' 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='1554' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3043'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='count' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE5countERKi' 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='1566' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3022'/>
+            <return type-id='type-id-3021'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='lower_bound' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11lower_boundERKi' 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='834' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3055'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3054'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='lower_bound' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11lower_boundERKi' 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='838' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <parameter type-id='type-id-3055'/>
-            <return type-id='type-id-3043'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3054'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='upper_bound' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11upper_boundERKi' 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='842' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
-            <parameter type-id='type-id-3055'/>
-            <return type-id='type-id-3041'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
+            <parameter type-id='type-id-3054'/>
+            <return type-id='type-id-3040'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='upper_bound' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11upper_boundERKi' 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='846' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
-            <parameter type-id='type-id-3055'/>
-            <return type-id='type-id-3043'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3054'/>
+            <return type-id='type-id-3042'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='equal_range' mangled-name='_ZNSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11equal_rangeERKi' 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='1159' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3049' is-artificial='yes'/>
+            <parameter type-id='type-id-3048' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3056'/>
+            <return type-id='type-id-3055'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='equal_range' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11equal_rangeERKi' 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='1190' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
-            <return type-id='type-id-3057'/>
+            <return type-id='type-id-3056'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='__rb_verify' mangled-name='_ZNKSt8_Rb_treeIiiSt9_IdentityIiESt4lessIiESaIiEE11__rb_verifyEv' 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='1581' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3050' is-artificial='yes'/>
+            <parameter type-id='type-id-3049' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;int&gt; &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-3020'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3058'/>
+      <class-decl name='allocator&lt;std::_Rb_tree_node&lt;int&gt; &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-3019'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3057'/>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3059' is-artificial='yes'/>
+            <parameter type-id='type-id-3058' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3059' is-artificial='yes'/>
-            <parameter type-id='type-id-3060'/>
+            <parameter type-id='type-id-3058' is-artificial='yes'/>
+            <parameter type-id='type-id-3059'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3059' is-artificial='yes'/>
+            <parameter type-id='type-id-3058' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_node&lt;int&gt;' size-in-bits='320' 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='130' column='1' id='type-id-3061'>
+      <class-decl name='_Rb_tree_node&lt;int&gt;' size-in-bits='320' 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='130' column='1' id='type-id-3060'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2392'/>
         <data-member access='public' layout-offset-in-bits='256'>
           <var-decl name='_M_value_field' type-id='type-id-36' 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='133' column='1'/>
         </data-member>
       </class-decl>
-      <class-decl name='less&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/bits/stl_function.h' line='233' column='1' id='type-id-3021'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3062'/>
+      <class-decl name='less&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/bits/stl_function.h' line='233' column='1' id='type-id-3020'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3061'/>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt4lessIiEclERKiS2_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_function.h' line='236' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3063' is-artificial='yes'/>
+            <parameter type-id='type-id-3062' is-artificial='yes'/>
             <parameter type-id='type-id-1185'/>
             <parameter type-id='type-id-1185'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='binary_function&lt;int, int, bool&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_function.h' line='116' column='1' id='type-id-3062'/>
-      <class-decl name='allocator&lt;int&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-3040'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3064'/>
+      <class-decl name='binary_function&lt;int, int, bool&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_function.h' line='116' column='1' id='type-id-3061'/>
+      <class-decl name='allocator&lt;int&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-3039'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3063'/>
         <member-type access='private'>
-          <class-decl name='rebind&lt;std::_Rb_tree_node&lt;int&gt; &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/allocator.h' line='101' column='1' id='type-id-3065'>
+          <class-decl name='rebind&lt;std::_Rb_tree_node&lt;int&gt; &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/allocator.h' line='101' column='1' id='type-id-3064'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3020' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='102' column='1' id='type-id-3028'/>
+              <typedef-decl name='other' type-id='type-id-3019' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='102' column='1' id='type-id-3027'/>
             </member-type>
           </class-decl>
         </member-type>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='104' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3066' is-artificial='yes'/>
+            <parameter type-id='type-id-3065' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3066' is-artificial='yes'/>
-            <parameter type-id='type-id-3067'/>
+            <parameter type-id='type-id-3065' is-artificial='yes'/>
+            <parameter type-id='type-id-3066'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes'>
           <function-decl name='~allocator' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/allocator.h' line='112' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3066' is-artificial='yes'/>
+            <parameter type-id='type-id-3065' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_iterator&lt;int&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/stl_tree.h' line='156' column='1' id='type-id-3042'>
+      <class-decl name='_Rb_tree_iterator&lt;int&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/stl_tree.h' line='156' column='1' id='type-id-3041'>
         <member-type access='public'>
-          <typedef-decl name='_Base_ptr' type-id='type-id-2393' 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-3068'/>
+          <typedef-decl name='_Base_ptr' type-id='type-id-2393' 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-3067'/>
         </member-type>
         <member-type access='public'>
-          <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='159' column='1' id='type-id-3069'/>
+          <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='159' column='1' id='type-id-3068'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1837' 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-3070'/>
+          <typedef-decl name='pointer' type-id='type-id-1837' 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-3069'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-3042' 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='165' column='1' id='type-id-3071'/>
+          <typedef-decl name='_Self' type-id='type-id-3041' 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='165' column='1' id='type-id-3070'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Link_type' type-id='type-id-3036' 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='167' column='1' id='type-id-3072'/>
+          <typedef-decl name='_Link_type' type-id='type-id-3035' 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='167' column='1' id='type-id-3071'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-3068' 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='223' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-3067' 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='223' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' 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='169' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <parameter type-id='type-id-3072' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_iterator' 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='173' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3073' is-artificial='yes'/>
-            <parameter type-id='type-id-3072'/>
+            <parameter type-id='type-id-3072' is-artificial='yes'/>
+            <parameter type-id='type-id-3071'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNKSt17_Rb_tree_iteratorIiEdeEv' 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='177' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3074' is-artificial='yes'/>
-            <return type-id='type-id-3069'/>
+            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <return type-id='type-id-3068'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt17_Rb_tree_iteratorIiEptEv' 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='181' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3074' is-artificial='yes'/>
-            <return type-id='type-id-3070'/>
+            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <return type-id='type-id-3069'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorIiEppEv' 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='186' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3073' is-artificial='yes'/>
-            <return type-id='type-id-3075'/>
+            <parameter type-id='type-id-3072' is-artificial='yes'/>
+            <return type-id='type-id-3074'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt17_Rb_tree_iteratorIiEppEi' 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='193' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <parameter type-id='type-id-3072' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-3071'/>
+            <return type-id='type-id-3070'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorIiEmmEv' 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='201' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3073' is-artificial='yes'/>
-            <return type-id='type-id-3075'/>
+            <parameter type-id='type-id-3072' is-artificial='yes'/>
+            <return type-id='type-id-3074'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt17_Rb_tree_iteratorIiEmmEi' 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='208' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <parameter type-id='type-id-3072' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-3071'/>
+            <return type-id='type-id-3070'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt17_Rb_tree_iteratorIiEeqERKS0_' 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='216' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3074' is-artificial='yes'/>
-            <parameter type-id='type-id-3076'/>
+            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <parameter type-id='type-id-3075'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt17_Rb_tree_iteratorIiEneERKS0_' 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='220' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3074' is-artificial='yes'/>
-            <parameter type-id='type-id-3076'/>
+            <parameter type-id='type-id-3073' is-artificial='yes'/>
+            <parameter type-id='type-id-3075'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='_Rb_tree_const_iterator&lt;int&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/stl_tree.h' line='227' column='1' id='type-id-3044'>
+      <class-decl name='_Rb_tree_const_iterator&lt;int&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/stl_tree.h' line='227' column='1' id='type-id-3043'>
         <member-type access='public'>
-          <typedef-decl name='_Base_ptr' type-id='type-id-2395' 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='239' column='1' id='type-id-3077'/>
+          <typedef-decl name='_Base_ptr' type-id='type-id-2395' 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='239' column='1' id='type-id-3076'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-1185' 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-3078'/>
+          <typedef-decl name='reference' type-id='type-id-1185' 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-3077'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-950' 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-3079'/>
+          <typedef-decl name='pointer' type-id='type-id-951' 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-3078'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='iterator' type-id='type-id-3042' 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-3080'/>
+          <typedef-decl name='iterator' type-id='type-id-3041' 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-3079'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Self' type-id='type-id-3044' 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='238' column='1' id='type-id-3081'/>
+          <typedef-decl name='_Self' type-id='type-id-3043' 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='238' column='1' id='type-id-3080'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Link_type' type-id='type-id-3038' 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='240' column='1' id='type-id-3082'/>
+          <typedef-decl name='_Link_type' type-id='type-id-3037' 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='240' column='1' id='type-id-3081'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_node' type-id='type-id-3077' 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='304' column='1'/>
+          <var-decl name='_M_node' type-id='type-id-3076' 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='304' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' 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='242' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' 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='246' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
-            <parameter type-id='type-id-3082'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
+            <parameter type-id='type-id-3081'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Rb_tree_const_iterator' 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='249' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
-            <parameter type-id='type-id-3084'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
+            <parameter type-id='type-id-3083'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_const_cast' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiE13_M_const_castEv' 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='253' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3085' is-artificial='yes'/>
-            <return type-id='type-id-3080'/>
+            <parameter type-id='type-id-3084' is-artificial='yes'/>
+            <return type-id='type-id-3079'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator*' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiEdeEv' 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='258' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3085' is-artificial='yes'/>
-            <return type-id='type-id-3078'/>
+            <parameter type-id='type-id-3084' is-artificial='yes'/>
+            <return type-id='type-id-3077'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator-&gt;' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiEptEv' 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='262' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3085' is-artificial='yes'/>
-            <return type-id='type-id-3079'/>
+            <parameter type-id='type-id-3084' is-artificial='yes'/>
+            <return type-id='type-id-3078'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorIiEppEv' 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='267' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
-            <return type-id='type-id-3086'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
+            <return type-id='type-id-3085'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator++' mangled-name='_ZNSt23_Rb_tree_const_iteratorIiEppEi' 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='274' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-3081'/>
+            <return type-id='type-id-3080'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorIiEmmEv' 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='282' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
-            <return type-id='type-id-3086'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
+            <return type-id='type-id-3085'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='operator--' mangled-name='_ZNSt23_Rb_tree_const_iteratorIiEmmEi' 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='289' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3083' is-artificial='yes'/>
+            <parameter type-id='type-id-3082' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
-            <return type-id='type-id-3081'/>
+            <return type-id='type-id-3080'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator==' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiEeqERKS0_' 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='297' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3085' is-artificial='yes'/>
-            <parameter type-id='type-id-3087'/>
+            <parameter type-id='type-id-3084' is-artificial='yes'/>
+            <parameter type-id='type-id-3086'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='operator!=' mangled-name='_ZNKSt23_Rb_tree_const_iteratorIiEneERKS0_' 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='301' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3085' is-artificial='yes'/>
-            <parameter type-id='type-id-3087'/>
+            <parameter type-id='type-id-3084' is-artificial='yes'/>
+            <parameter type-id='type-id-3086'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;int&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3046'/>
-      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;int&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3048'/>
-      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;int&gt;, std::_Rb_tree_iterator&lt;int&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3056'/>
-      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;int&gt;, std::_Rb_tree_const_iterator&lt;int&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3057'/>
-      <class-decl name='_Vector_base&lt;std::__regex::_State, std::allocator&lt;std::__regex::_State&gt; &gt;' size-in-bits='192' 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_vector.h' line='73' column='1' id='type-id-3088'>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_iterator&lt;int&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3045'/>
+      <class-decl name='reverse_iterator&lt;std::_Rb_tree_const_iterator&lt;int&gt; &gt;' visibility='default' is-declaration-only='yes' id='type-id-3047'/>
+      <class-decl name='pair&lt;std::_Rb_tree_iterator&lt;int&gt;, std::_Rb_tree_iterator&lt;int&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3055'/>
+      <class-decl name='pair&lt;std::_Rb_tree_const_iterator&lt;int&gt;, std::_Rb_tree_const_iterator&lt;int&gt; &gt;' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-3056'/>
+      <class-decl name='_Vector_base&lt;std::__regex::_State, std::allocator&lt;std::__regex::_State&gt; &gt;' size-in-bits='192' 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_vector.h' line='73' column='1' id='type-id-3087'>
         <member-type access='public'>
-          <class-decl name='_Vector_impl' size-in-bits='192' 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_vector.h' line='80' column='1' id='type-id-3089'>
-            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3008'/>
+          <class-decl name='_Vector_impl' size-in-bits='192' 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_vector.h' line='80' column='1' id='type-id-3088'>
+            <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3007'/>
             <data-member access='public' layout-offset-in-bits='0'>
-              <var-decl name='_M_start' type-id='type-id-3090' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='83' column='1'/>
+              <var-decl name='_M_start' type-id='type-id-3089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='83' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='64'>
-              <var-decl name='_M_finish' type-id='type-id-3090' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='84' column='1'/>
+              <var-decl name='_M_finish' type-id='type-id-3089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='84' column='1'/>
             </data-member>
             <data-member access='public' layout-offset-in-bits='128'>
-              <var-decl name='_M_end_of_storage' type-id='type-id-3090' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='85' column='1'/>
+              <var-decl name='_M_end_of_storage' type-id='type-id-3089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='85' column='1'/>
             </data-member>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='87' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3091' is-artificial='yes'/>
+                <parameter type-id='type-id-3090' is-artificial='yes'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='91' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3091' is-artificial='yes'/>
-                <parameter type-id='type-id-3092'/>
+                <parameter type-id='type-id-3090' is-artificial='yes'/>
+                <parameter type-id='type-id-3091'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public' constructor='yes'>
               <function-decl name='_Vector_impl' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3091' is-artificial='yes'/>
-                <parameter type-id='type-id-3093'/>
+                <parameter type-id='type-id-3090' is-artificial='yes'/>
+                <parameter type-id='type-id-3092'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
             <member-function access='public'>
               <function-decl name='_M_swap_data' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE12_Vector_impl12_M_swap_dataERS4_' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='102' column='1' visibility='default' binding='global' size-in-bits='64'>
-                <parameter type-id='type-id-3091' is-artificial='yes'/>
-                <parameter type-id='type-id-3094'/>
+                <parameter type-id='type-id-3090' is-artificial='yes'/>
+                <parameter type-id='type-id-3093'/>
                 <return type-id='type-id-4'/>
               </function-decl>
             </member-function>
           </class-decl>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3095' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='78' column='1' id='type-id-3090'/>
+          <typedef-decl name='pointer' type-id='type-id-3094' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='78' column='1' id='type-id-3089'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3097' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='76' column='1' id='type-id-3096'/>
+          <typedef-decl name='_Tp_alloc_type' type-id='type-id-3096' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='76' column='1' id='type-id-3095'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='allocator_type' type-id='type-id-3008' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='111' column='1' id='type-id-3098'/>
+          <typedef-decl name='allocator_type' type-id='type-id-3007' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='111' column='1' id='type-id-3097'/>
         </member-type>
         <data-member access='public' layout-offset-in-bits='0'>
-          <var-decl name='_M_impl' type-id='type-id-3089' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='165' column='1'/>
+          <var-decl name='_M_impl' type-id='type-id-3088' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='165' column='1'/>
         </data-member>
         <member-function access='public'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE19_M_get_Tp_allocatorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <return type-id='type-id-3093'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
+            <return type-id='type-id-3092'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='_M_get_Tp_allocator' mangled-name='_ZNKSt12_Vector_baseINSt7__regex6_StateESaIS1_EE19_M_get_Tp_allocatorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='118' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3100' is-artificial='yes'/>
-            <return type-id='type-id-3092'/>
+            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <return type-id='type-id-3091'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='get_allocator' mangled-name='_ZNKSt12_Vector_baseINSt7__regex6_StateESaIS1_EE13get_allocatorEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='122' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3100' is-artificial='yes'/>
-            <return type-id='type-id-3098'/>
+            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <return type-id='type-id-3097'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='125' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='128' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3101'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
+            <parameter type-id='type-id-3100'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='131' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='135' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
-            <parameter type-id='type-id-3101'/>
+            <parameter type-id='type-id-3100'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='140' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3093'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
+            <parameter type-id='type-id-3092'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='143' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3102'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
+            <parameter type-id='type-id-3101'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='147' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3102'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <parameter type-id='type-id-3101'/>
+            <parameter type-id='type-id-3100'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~_Vector_base' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='160' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_allocate' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE11_M_allocateEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
-            <return type-id='type-id-3090'/>
+            <return type-id='type-id-3089'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='_M_deallocate' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE13_M_deallocateEPS1_m' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
-            <parameter type-id='type-id-3090'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
+            <parameter type-id='type-id-3089'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='_M_create_storage' mangled-name='_ZNSt12_Vector_baseINSt7__regex6_StateESaIS1_EE17_M_create_storageEm' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/stl_vector.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3099' is-artificial='yes'/>
+            <parameter type-id='type-id-3098' is-artificial='yes'/>
             <parameter type-id='type-id-66'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='allocator_traits&lt;std::allocator&lt;std::__regex::_State&gt; &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/alloc_traits.h' line='87' column='1' id='type-id-3103'>
+      <class-decl name='allocator_traits&lt;std::allocator&lt;std::__regex::_State&gt; &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/alloc_traits.h' line='87' column='1' id='type-id-3102'>
         <member-type access='private'>
-          <typedef-decl name='__pointer' type-id='type-id-3010' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='102' column='1' id='type-id-3104'/>
+          <typedef-decl name='__pointer' type-id='type-id-3009' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='102' column='1' id='type-id-3103'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3104' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='109' column='1' id='type-id-3105'/>
+          <typedef-decl name='pointer' type-id='type-id-3103' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='109' column='1' id='type-id-3104'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='rebind_alloc' type-id='type-id-3107' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='204' column='1' id='type-id-3106'/>
+          <typedef-decl name='rebind_alloc' type-id='type-id-3106' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='204' column='1' id='type-id-3105'/>
         </member-type>
       </class-decl>
-      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::__regex::_State&gt;, std::__regex::_State, 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/alloc_traits.h' line='70' column='1' id='type-id-3108'>
+      <class-decl name='__alloctr_rebind&lt;std::allocator&lt;std::__regex::_State&gt;, std::__regex::_State, 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/alloc_traits.h' line='70' column='1' id='type-id-3107'>
         <member-type access='public'>
-          <typedef-decl name='__type' type-id='type-id-3012' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='72' column='1' id='type-id-3107'/>
+          <typedef-decl name='__type' type-id='type-id-3011' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/alloc_traits.h' line='72' column='1' id='type-id-3106'/>
         </member-type>
       </class-decl>
-      <class-decl name='system_error' 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/system_error' line='309' column='1' id='type-id-3109'>
+      <class-decl name='system_error' 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/system_error' line='309' column='1' id='type-id-3108'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2347'/>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_code' type-id='type-id-1208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='312' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='system_error' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='315' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-1208'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='system_error' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-1208'/>
             <parameter type-id='type-id-89'/>
             <return type-id='type-id-4'/>
@@ -46010,7 +46009,7 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='system_error' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='332' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-1190'/>
             <return type-id='type-id-4'/>
@@ -46018,7 +46017,7 @@
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='system_error' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='336' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-36'/>
             <parameter type-id='type-id-1190'/>
             <parameter type-id='type-id-89'/>
@@ -46027,441 +46026,441 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='code' mangled-name='_ZNKSt12system_error4codeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3111' is-artificial='yes'/>
+            <parameter type-id='type-id-3110' is-artificial='yes'/>
             <return type-id='type-id-1195'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~system_error' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='309' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~system_error' mangled-name='_ZNSt12system_errorD0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12system_errorD0Ev@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~system_error' mangled-name='_ZNSt12system_errorD2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/system_error' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12system_errorD2Ev@@GLIBCXX_3.4.11'>
-            <parameter type-id='type-id-3110' is-artificial='yes'/>
+            <parameter type-id='type-id-3109' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='future_error' 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/future' line='91' column='1' id='type-id-3112'>
+      <class-decl name='future_error' 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/future' line='91' column='1' id='type-id-3111'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2344'/>
         <data-member access='private' layout-offset-in-bits='128'>
           <var-decl name='_M_code' type-id='type-id-1208' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='93' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='future_error' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='96' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3113' is-artificial='yes'/>
+            <parameter type-id='type-id-3112' is-artificial='yes'/>
             <parameter type-id='type-id-1208'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='code' mangled-name='_ZNKSt12future_error4codeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/future' line='106' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3114' is-artificial='yes'/>
+            <parameter type-id='type-id-3113' is-artificial='yes'/>
             <return type-id='type-id-1195'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~future_error' filepath='../../../.././libstdc++-v3/src/c++11/future.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3113' is-artificial='yes'/>
+            <parameter type-id='type-id-3112' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~future_error' mangled-name='_ZNSt12future_errorD0Ev' filepath='../../../.././libstdc++-v3/src/c++11/future.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12future_errorD0Ev@@GLIBCXX_3.4.14'>
-            <parameter type-id='type-id-3113' is-artificial='yes'/>
+            <parameter type-id='type-id-3112' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~future_error' mangled-name='_ZNSt12future_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++11/future.cc' line='75' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12future_errorD2Ev@@GLIBCXX_3.4.14'>
-            <parameter type-id='type-id-3113' is-artificial='yes'/>
+            <parameter type-id='type-id-3112' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt12future_error4whatEv' filepath='../../../.././libstdc++-v3/src/c++11/future.cc' line='78' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12future_error4whatEv@@GLIBCXX_3.4.14'>
-            <parameter type-id='type-id-3114' is-artificial='yes'/>
+            <parameter type-id='type-id-3113' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
       </class-decl>
     </namespace-decl>
 
-    <pointer-type-def type-id='type-id-2974' size-in-bits='64' id='type-id-2975'/>
-    <qualified-type-def type-id='type-id-2974' const='yes' id='type-id-3115'/>
-    <pointer-type-def type-id='type-id-3115' size-in-bits='64' id='type-id-2976'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3115' size-in-bits='64' id='type-id-2996'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2977' size-in-bits='64' id='type-id-2997'/>
-    <pointer-type-def type-id='type-id-3116' size-in-bits='64' id='type-id-2991'/>
-    <pointer-type-def type-id='type-id-2978' size-in-bits='64' id='type-id-2992'/>
-    <qualified-type-def type-id='type-id-2978' const='yes' id='type-id-3117'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3117' size-in-bits='64' id='type-id-2993'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2978' size-in-bits='64' id='type-id-2994'/>
-    <pointer-type-def type-id='type-id-3117' size-in-bits='64' id='type-id-2995'/>
-    <pointer-type-def type-id='type-id-3118' size-in-bits='64' id='type-id-3001'/>
-    <pointer-type-def type-id='type-id-2979' size-in-bits='64' id='type-id-3002'/>
-    <qualified-type-def type-id='type-id-2979' const='yes' id='type-id-3119'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3119' size-in-bits='64' id='type-id-3003'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2979' size-in-bits='64' id='type-id-3004'/>
-    <pointer-type-def type-id='type-id-3119' size-in-bits='64' id='type-id-3005'/>
-    <pointer-type-def type-id='type-id-2966' size-in-bits='64' id='type-id-2971'/>
-    <qualified-type-def type-id='type-id-2970' const='yes' id='type-id-3120'/>
+    <pointer-type-def type-id='type-id-2973' size-in-bits='64' id='type-id-2974'/>
+    <qualified-type-def type-id='type-id-2973' const='yes' id='type-id-3114'/>
+    <pointer-type-def type-id='type-id-3114' size-in-bits='64' id='type-id-2975'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3114' size-in-bits='64' id='type-id-2995'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2976' size-in-bits='64' id='type-id-2996'/>
+    <pointer-type-def type-id='type-id-3115' size-in-bits='64' id='type-id-2990'/>
+    <pointer-type-def type-id='type-id-2977' size-in-bits='64' id='type-id-2991'/>
+    <qualified-type-def type-id='type-id-2977' const='yes' id='type-id-3116'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3116' size-in-bits='64' id='type-id-2992'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2977' size-in-bits='64' id='type-id-2993'/>
+    <pointer-type-def type-id='type-id-3116' size-in-bits='64' id='type-id-2994'/>
+    <pointer-type-def type-id='type-id-3117' size-in-bits='64' id='type-id-3000'/>
+    <pointer-type-def type-id='type-id-2978' size-in-bits='64' id='type-id-3001'/>
+    <qualified-type-def type-id='type-id-2978' const='yes' id='type-id-3118'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3118' size-in-bits='64' id='type-id-3002'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2978' size-in-bits='64' id='type-id-3003'/>
+    <pointer-type-def type-id='type-id-3118' size-in-bits='64' id='type-id-3004'/>
+    <pointer-type-def type-id='type-id-2965' size-in-bits='64' id='type-id-2970'/>
+    <qualified-type-def type-id='type-id-2969' const='yes' id='type-id-3119'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3119' size-in-bits='64' id='type-id-2971'/>
+    <qualified-type-def type-id='type-id-2968' const='yes' id='type-id-3120'/>
     <reference-type-def kind='lvalue' type-id='type-id-3120' size-in-bits='64' id='type-id-2972'/>
-    <qualified-type-def type-id='type-id-2969' const='yes' id='type-id-3121'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3121' size-in-bits='64' id='type-id-2973'/>
-    <reference-type-def kind='lvalue' type-id='type-id-2966' size-in-bits='64' id='type-id-3007'/>
+    <reference-type-def kind='lvalue' type-id='type-id-2965' size-in-bits='64' id='type-id-3006'/>
     <namespace-decl name='__gnu_cxx'>
-      <class-decl name='new_allocator&lt;std::__regex::_State&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/new_allocator.h' line='54' column='1' id='type-id-3009'>
+      <class-decl name='new_allocator&lt;std::__regex::_State&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/new_allocator.h' line='54' column='1' id='type-id-3008'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-66' 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='57' column='1' id='type-id-3122'/>
+          <typedef-decl name='size_type' type-id='type-id-66' 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='57' column='1' id='type-id-3121'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-2971' 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-3123'/>
+          <typedef-decl name='pointer' type-id='type-id-2970' 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-3122'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-3125' 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-3124'/>
+          <typedef-decl name='const_pointer' type-id='type-id-3124' 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-3123'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3007' 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-3126'/>
+          <typedef-decl name='reference' type-id='type-id-3006' 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-3125'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3128' 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-3127'/>
+          <typedef-decl name='const_reference' type-id='type-id-3127' 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-3126'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' 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='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3129' is-artificial='yes'/>
+            <parameter type-id='type-id-3128' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' 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='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3129' is-artificial='yes'/>
-            <parameter type-id='type-id-3130'/>
+            <parameter type-id='type-id-3128' is-artificial='yes'/>
+            <parameter type-id='type-id-3129'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' 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='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3129' is-artificial='yes'/>
+            <parameter type-id='type-id-3128' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorINSt7__regex6_StateEE7addressERS2_' 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='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3131' is-artificial='yes'/>
-            <parameter type-id='type-id-3126'/>
-            <return type-id='type-id-3123'/>
+            <parameter type-id='type-id-3130' is-artificial='yes'/>
+            <parameter type-id='type-id-3125'/>
+            <return type-id='type-id-3122'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorINSt7__regex6_StateEE7addressERKS2_' 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='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3131' is-artificial='yes'/>
-            <parameter type-id='type-id-3127'/>
-            <return type-id='type-id-3124'/>
+            <parameter type-id='type-id-3130' is-artificial='yes'/>
+            <parameter type-id='type-id-3126'/>
+            <return type-id='type-id-3123'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt7__regex6_StateEE8allocateEmPKv' 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='89' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3129' is-artificial='yes'/>
-            <parameter type-id='type-id-3122'/>
+            <parameter type-id='type-id-3128' is-artificial='yes'/>
+            <parameter type-id='type-id-3121'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-3123'/>
+            <return type-id='type-id-3122'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorINSt7__regex6_StateEE10deallocateEPS2_m' 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='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3129' is-artificial='yes'/>
-            <parameter type-id='type-id-3123'/>
+            <parameter type-id='type-id-3128' is-artificial='yes'/>
             <parameter type-id='type-id-3122'/>
+            <parameter type-id='type-id-3121'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorINSt7__regex6_StateEE8max_sizeEv' 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='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3131' is-artificial='yes'/>
-            <return type-id='type-id-3122'/>
+            <parameter type-id='type-id-3130' is-artificial='yes'/>
+            <return type-id='type-id-3121'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;int&gt; &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/new_allocator.h' line='54' column='1' id='type-id-3058'>
+      <class-decl name='new_allocator&lt;std::_Rb_tree_node&lt;int&gt; &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/new_allocator.h' line='54' column='1' id='type-id-3057'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-66' 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='57' column='1' id='type-id-3132'/>
+          <typedef-decl name='size_type' type-id='type-id-66' 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='57' column='1' id='type-id-3131'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3036' 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-3133'/>
+          <typedef-decl name='pointer' type-id='type-id-3035' 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-3132'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-3038' 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-3134'/>
+          <typedef-decl name='const_pointer' type-id='type-id-3037' 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-3133'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='reference' type-id='type-id-3136' 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-3135'/>
+          <typedef-decl name='reference' type-id='type-id-3135' 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-3134'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-3138' 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-3137'/>
+          <typedef-decl name='const_reference' type-id='type-id-3137' 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-3136'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' 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='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3139' is-artificial='yes'/>
+            <parameter type-id='type-id-3138' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' 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='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3139' is-artificial='yes'/>
-            <parameter type-id='type-id-3140'/>
+            <parameter type-id='type-id-3138' is-artificial='yes'/>
+            <parameter type-id='type-id-3139'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' 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='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3139' is-artificial='yes'/>
+            <parameter type-id='type-id-3138' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeIiEE7addressERS2_' 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='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3141' is-artificial='yes'/>
-            <parameter type-id='type-id-3135'/>
-            <return type-id='type-id-3133'/>
+            <parameter type-id='type-id-3140' is-artificial='yes'/>
+            <parameter type-id='type-id-3134'/>
+            <return type-id='type-id-3132'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeIiEE7addressERKS2_' 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='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3141' is-artificial='yes'/>
-            <parameter type-id='type-id-3137'/>
-            <return type-id='type-id-3134'/>
+            <parameter type-id='type-id-3140' is-artificial='yes'/>
+            <parameter type-id='type-id-3136'/>
+            <return type-id='type-id-3133'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeIiEE8allocateEmPKv' 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='89' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3139' is-artificial='yes'/>
-            <parameter type-id='type-id-3132'/>
+            <parameter type-id='type-id-3138' is-artificial='yes'/>
+            <parameter type-id='type-id-3131'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-3133'/>
+            <return type-id='type-id-3132'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeIiEE10deallocateEPS2_m' 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='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3139' is-artificial='yes'/>
-            <parameter type-id='type-id-3133'/>
+            <parameter type-id='type-id-3138' is-artificial='yes'/>
             <parameter type-id='type-id-3132'/>
+            <parameter type-id='type-id-3131'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorISt13_Rb_tree_nodeIiEE8max_sizeEv' 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='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3141' is-artificial='yes'/>
-            <return type-id='type-id-3132'/>
+            <parameter type-id='type-id-3140' is-artificial='yes'/>
+            <return type-id='type-id-3131'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='destroy&lt;std::_Rb_tree_node&lt;int&gt; &gt;' 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='114' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3139' is-artificial='yes'/>
-            <parameter type-id='type-id-3036'/>
+            <parameter type-id='type-id-3138' is-artificial='yes'/>
+            <parameter type-id='type-id-3035'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='new_allocator&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/ext/new_allocator.h' line='54' column='1' id='type-id-3064'>
+      <class-decl name='new_allocator&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/ext/new_allocator.h' line='54' column='1' id='type-id-3063'>
         <member-type access='public'>
-          <typedef-decl name='size_type' type-id='type-id-66' 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='57' column='1' id='type-id-3142'/>
+          <typedef-decl name='size_type' type-id='type-id-66' 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='57' column='1' id='type-id-3141'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-1837' 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-3143'/>
+          <typedef-decl name='pointer' type-id='type-id-1837' 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-3142'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_pointer' type-id='type-id-950' 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-3144'/>
+          <typedef-decl name='const_pointer' type-id='type-id-951' 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-3143'/>
         </member-type>
         <member-type access='public'>
-          <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/ext/new_allocator.h' line='61' column='1' id='type-id-3145'/>
+          <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/ext/new_allocator.h' line='61' column='1' id='type-id-3144'/>
         </member-type>
         <member-type access='public'>
-          <typedef-decl name='const_reference' type-id='type-id-1185' 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-3146'/>
+          <typedef-decl name='const_reference' type-id='type-id-1185' 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-3145'/>
         </member-type>
         <member-function access='public'>
           <function-decl name='new_allocator' 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='69' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3147' is-artificial='yes'/>
+            <parameter type-id='type-id-3146' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='new_allocator' 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='71' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3147' is-artificial='yes'/>
-            <parameter type-id='type-id-3148'/>
+            <parameter type-id='type-id-3146' is-artificial='yes'/>
+            <parameter type-id='type-id-3147'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' destructor='yes'>
           <function-decl name='~new_allocator' 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='76' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3147' is-artificial='yes'/>
+            <parameter type-id='type-id-3146' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIiE7addressERi' 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='79' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3149' is-artificial='yes'/>
-            <parameter type-id='type-id-3145'/>
-            <return type-id='type-id-3143'/>
+            <parameter type-id='type-id-3148' is-artificial='yes'/>
+            <parameter type-id='type-id-3144'/>
+            <return type-id='type-id-3142'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='address' mangled-name='_ZNK9__gnu_cxx13new_allocatorIiE7addressERKi' 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='83' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3149' is-artificial='yes'/>
-            <parameter type-id='type-id-3146'/>
-            <return type-id='type-id-3144'/>
+            <parameter type-id='type-id-3148' is-artificial='yes'/>
+            <parameter type-id='type-id-3145'/>
+            <return type-id='type-id-3143'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='allocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIiE8allocateEmPKv' 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='89' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3147' is-artificial='yes'/>
-            <parameter type-id='type-id-3142'/>
+            <parameter type-id='type-id-3146' is-artificial='yes'/>
+            <parameter type-id='type-id-3141'/>
             <parameter type-id='type-id-33'/>
-            <return type-id='type-id-3143'/>
+            <return type-id='type-id-3142'/>
           </function-decl>
         </member-function>
         <member-function access='public'>
           <function-decl name='deallocate' mangled-name='_ZN9__gnu_cxx13new_allocatorIiE10deallocateEPim' 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='99' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3147' is-artificial='yes'/>
-            <parameter type-id='type-id-3143'/>
+            <parameter type-id='type-id-3146' is-artificial='yes'/>
             <parameter type-id='type-id-3142'/>
+            <parameter type-id='type-id-3141'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='public' const='yes'>
           <function-decl name='max_size' mangled-name='_ZNK9__gnu_cxx13new_allocatorIiE8max_sizeEv' 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='103' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3149' is-artificial='yes'/>
-            <return type-id='type-id-3142'/>
+            <parameter type-id='type-id-3148' is-artificial='yes'/>
+            <return type-id='type-id-3141'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__alloc_traits&lt;std::allocator&lt;std::__regex::_State&gt; &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/alloc_traits.h' line='110' column='1' id='type-id-3150'>
+      <class-decl name='__alloc_traits&lt;std::allocator&lt;std::__regex::_State&gt; &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/alloc_traits.h' line='110' column='1' id='type-id-3149'>
         <member-type access='public'>
-          <typedef-decl name='pointer' type-id='type-id-3105' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='119' column='1' id='type-id-3095'/>
+          <typedef-decl name='pointer' type-id='type-id-3104' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='119' column='1' id='type-id-3094'/>
         </member-type>
         <member-type access='public'>
-          <class-decl name='rebind&lt;std::__regex::_State&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/alloc_traits.h' line='183' column='1' id='type-id-3151'>
+          <class-decl name='rebind&lt;std::__regex::_State&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/alloc_traits.h' line='183' column='1' id='type-id-3150'>
             <member-type access='public'>
-              <typedef-decl name='other' type-id='type-id-3106' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='184' column='1' id='type-id-3097'/>
+              <typedef-decl name='other' type-id='type-id-3105' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/ext/alloc_traits.h' line='184' column='1' id='type-id-3096'/>
             </member-type>
           </class-decl>
         </member-type>
       </class-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-2966' const='yes' id='type-id-3152'/>
-    <pointer-type-def type-id='type-id-3152' size-in-bits='64' id='type-id-3125'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3152' size-in-bits='64' id='type-id-3128'/>
-    <pointer-type-def type-id='type-id-3009' size-in-bits='64' id='type-id-3129'/>
-    <qualified-type-def type-id='type-id-3009' const='yes' id='type-id-3153'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3153' size-in-bits='64' id='type-id-3130'/>
-    <pointer-type-def type-id='type-id-3153' size-in-bits='64' id='type-id-3131'/>
-    <pointer-type-def type-id='type-id-3008' size-in-bits='64' id='type-id-3013'/>
-    <qualified-type-def type-id='type-id-3008' const='yes' id='type-id-3154'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3154' size-in-bits='64' id='type-id-3014'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3008' size-in-bits='64' id='type-id-3015'/>
-
-    <qualified-type-def type-id='type-id-2981' const='yes' id='type-id-2982'/>
-    <pointer-type-def type-id='type-id-2980' size-in-bits='64' id='type-id-2983'/>
-    <pointer-type-def type-id='type-id-2984' size-in-bits='64' id='type-id-2986'/>
-    <qualified-type-def type-id='type-id-2984' const='yes' id='type-id-3155'/>
-    <pointer-type-def type-id='type-id-3155' size-in-bits='64' id='type-id-2987'/>
-    <pointer-type-def type-id='type-id-3061' size-in-bits='64' id='type-id-3036'/>
-    <qualified-type-def type-id='type-id-3061' const='yes' id='type-id-3156'/>
-    <pointer-type-def type-id='type-id-3156' size-in-bits='64' id='type-id-3038'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3061' size-in-bits='64' id='type-id-3136'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3156' size-in-bits='64' id='type-id-3138'/>
-    <pointer-type-def type-id='type-id-3058' size-in-bits='64' id='type-id-3139'/>
-    <qualified-type-def type-id='type-id-3058' const='yes' id='type-id-3157'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3157' size-in-bits='64' id='type-id-3140'/>
-    <pointer-type-def type-id='type-id-3157' size-in-bits='64' id='type-id-3141'/>
-    <pointer-type-def type-id='type-id-3020' size-in-bits='64' id='type-id-3059'/>
+    <qualified-type-def type-id='type-id-2965' const='yes' id='type-id-3151'/>
+    <pointer-type-def type-id='type-id-3151' size-in-bits='64' id='type-id-3124'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3151' size-in-bits='64' id='type-id-3127'/>
+    <pointer-type-def type-id='type-id-3008' size-in-bits='64' id='type-id-3128'/>
+    <qualified-type-def type-id='type-id-3008' const='yes' id='type-id-3152'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3152' size-in-bits='64' id='type-id-3129'/>
+    <pointer-type-def type-id='type-id-3152' size-in-bits='64' id='type-id-3130'/>
+    <pointer-type-def type-id='type-id-3007' size-in-bits='64' id='type-id-3012'/>
+    <qualified-type-def type-id='type-id-3007' const='yes' id='type-id-3153'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3153' size-in-bits='64' id='type-id-3013'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3007' size-in-bits='64' id='type-id-3014'/>
+
+    <qualified-type-def type-id='type-id-2980' const='yes' id='type-id-2981'/>
+    <pointer-type-def type-id='type-id-2979' size-in-bits='64' id='type-id-2982'/>
+    <pointer-type-def type-id='type-id-2983' size-in-bits='64' id='type-id-2985'/>
+    <qualified-type-def type-id='type-id-2983' const='yes' id='type-id-3154'/>
+    <pointer-type-def type-id='type-id-3154' size-in-bits='64' id='type-id-2986'/>
+    <pointer-type-def type-id='type-id-3060' size-in-bits='64' id='type-id-3035'/>
+    <qualified-type-def type-id='type-id-3060' const='yes' id='type-id-3155'/>
+    <pointer-type-def type-id='type-id-3155' size-in-bits='64' id='type-id-3037'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3060' size-in-bits='64' id='type-id-3135'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3155' size-in-bits='64' id='type-id-3137'/>
+    <pointer-type-def type-id='type-id-3057' size-in-bits='64' id='type-id-3138'/>
+    <qualified-type-def type-id='type-id-3057' const='yes' id='type-id-3156'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3156' size-in-bits='64' id='type-id-3139'/>
+    <pointer-type-def type-id='type-id-3156' size-in-bits='64' id='type-id-3140'/>
+    <pointer-type-def type-id='type-id-3019' size-in-bits='64' id='type-id-3058'/>
+    <qualified-type-def type-id='type-id-3019' const='yes' id='type-id-3157'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3157' size-in-bits='64' id='type-id-3059'/>
     <qualified-type-def type-id='type-id-3020' const='yes' id='type-id-3158'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3158' size-in-bits='64' id='type-id-3060'/>
-    <qualified-type-def type-id='type-id-3021' const='yes' id='type-id-3159'/>
-    <pointer-type-def type-id='type-id-3159' size-in-bits='64' id='type-id-3063'/>
-    <pointer-type-def type-id='type-id-3019' size-in-bits='64' id='type-id-3023'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3159' size-in-bits='64' id='type-id-3024'/>
-    <pointer-type-def type-id='type-id-3064' size-in-bits='64' id='type-id-3147'/>
-    <qualified-type-def type-id='type-id-3064' const='yes' id='type-id-3160'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3160' size-in-bits='64' id='type-id-3148'/>
-    <pointer-type-def type-id='type-id-3160' size-in-bits='64' id='type-id-3149'/>
-    <pointer-type-def type-id='type-id-3040' size-in-bits='64' id='type-id-3066'/>
-    <qualified-type-def type-id='type-id-3040' const='yes' id='type-id-3161'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3161' size-in-bits='64' id='type-id-3067'/>
-    <qualified-type-def type-id='type-id-3027' const='yes' id='type-id-3162'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3162' size-in-bits='64' id='type-id-3025'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3027' size-in-bits='64' id='type-id-3026'/>
-    <qualified-type-def type-id='type-id-3032' const='yes' id='type-id-3163'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3163' size-in-bits='64' id='type-id-3034'/>
-    <pointer-type-def type-id='type-id-3042' size-in-bits='64' id='type-id-3073'/>
-    <qualified-type-def type-id='type-id-3042' const='yes' id='type-id-3164'/>
-    <pointer-type-def type-id='type-id-3164' size-in-bits='64' id='type-id-3074'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3071' size-in-bits='64' id='type-id-3075'/>
-    <qualified-type-def type-id='type-id-3071' const='yes' id='type-id-3165'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3165' size-in-bits='64' id='type-id-3076'/>
-    <pointer-type-def type-id='type-id-3044' size-in-bits='64' id='type-id-3083'/>
-    <qualified-type-def type-id='type-id-3080' const='yes' id='type-id-3166'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3166' size-in-bits='64' id='type-id-3084'/>
-    <qualified-type-def type-id='type-id-3044' const='yes' id='type-id-3167'/>
-    <pointer-type-def type-id='type-id-3167' size-in-bits='64' id='type-id-3085'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3081' size-in-bits='64' id='type-id-3086'/>
-    <qualified-type-def type-id='type-id-3081' const='yes' id='type-id-3168'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3168' size-in-bits='64' id='type-id-3087'/>
-    <pointer-type-def type-id='type-id-3018' size-in-bits='64' id='type-id-3049'/>
-    <qualified-type-def type-id='type-id-3018' const='yes' id='type-id-3169'/>
-    <pointer-type-def type-id='type-id-3169' size-in-bits='64' id='type-id-3050'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3029' size-in-bits='64' id='type-id-3051'/>
-    <qualified-type-def type-id='type-id-3039' const='yes' id='type-id-3170'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3170' size-in-bits='64' id='type-id-3052'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3169' size-in-bits='64' id='type-id-3053'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3018' size-in-bits='64' id='type-id-3054'/>
-    <qualified-type-def type-id='type-id-3031' const='yes' id='type-id-3171'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3171' size-in-bits='64' id='type-id-3055'/>
-    <pointer-type-def type-id='type-id-3089' size-in-bits='64' id='type-id-3091'/>
-    <qualified-type-def type-id='type-id-3096' const='yes' id='type-id-3172'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3172' size-in-bits='64' id='type-id-3092'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3096' size-in-bits='64' id='type-id-3093'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3089' size-in-bits='64' id='type-id-3094'/>
-    <pointer-type-def type-id='type-id-3088' size-in-bits='64' id='type-id-3099'/>
-    <qualified-type-def type-id='type-id-3088' const='yes' id='type-id-3173'/>
-    <pointer-type-def type-id='type-id-3173' size-in-bits='64' id='type-id-3100'/>
-    <qualified-type-def type-id='type-id-3098' const='yes' id='type-id-3174'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3174' size-in-bits='64' id='type-id-3101'/>
-    <reference-type-def kind='lvalue' type-id='type-id-3088' size-in-bits='64' id='type-id-3102'/>
-    <pointer-type-def type-id='type-id-3109' size-in-bits='64' id='type-id-3110'/>
-    <pointer-type-def type-id='type-id-3112' size-in-bits='64' id='type-id-3113'/>
-    <pointer-type-def type-id='type-id-3175' size-in-bits='64' id='type-id-3114'/>
-    <pointer-type-def type-id='type-id-3176' size-in-bits='64' id='type-id-3111'/>
-    <function-type size-in-bits='64' id='type-id-3118'>
+    <pointer-type-def type-id='type-id-3158' size-in-bits='64' id='type-id-3062'/>
+    <pointer-type-def type-id='type-id-3018' size-in-bits='64' id='type-id-3022'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3158' size-in-bits='64' id='type-id-3023'/>
+    <pointer-type-def type-id='type-id-3063' size-in-bits='64' id='type-id-3146'/>
+    <qualified-type-def type-id='type-id-3063' const='yes' id='type-id-3159'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3159' size-in-bits='64' id='type-id-3147'/>
+    <pointer-type-def type-id='type-id-3159' size-in-bits='64' id='type-id-3148'/>
+    <pointer-type-def type-id='type-id-3039' size-in-bits='64' id='type-id-3065'/>
+    <qualified-type-def type-id='type-id-3039' const='yes' id='type-id-3160'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3160' size-in-bits='64' id='type-id-3066'/>
+    <qualified-type-def type-id='type-id-3026' const='yes' id='type-id-3161'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3161' size-in-bits='64' id='type-id-3024'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3026' size-in-bits='64' id='type-id-3025'/>
+    <qualified-type-def type-id='type-id-3031' const='yes' id='type-id-3162'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3162' size-in-bits='64' id='type-id-3033'/>
+    <pointer-type-def type-id='type-id-3041' size-in-bits='64' id='type-id-3072'/>
+    <qualified-type-def type-id='type-id-3041' const='yes' id='type-id-3163'/>
+    <pointer-type-def type-id='type-id-3163' size-in-bits='64' id='type-id-3073'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3070' size-in-bits='64' id='type-id-3074'/>
+    <qualified-type-def type-id='type-id-3070' const='yes' id='type-id-3164'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3164' size-in-bits='64' id='type-id-3075'/>
+    <pointer-type-def type-id='type-id-3043' size-in-bits='64' id='type-id-3082'/>
+    <qualified-type-def type-id='type-id-3079' const='yes' id='type-id-3165'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3165' size-in-bits='64' id='type-id-3083'/>
+    <qualified-type-def type-id='type-id-3043' const='yes' id='type-id-3166'/>
+    <pointer-type-def type-id='type-id-3166' size-in-bits='64' id='type-id-3084'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3080' size-in-bits='64' id='type-id-3085'/>
+    <qualified-type-def type-id='type-id-3080' const='yes' id='type-id-3167'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3167' size-in-bits='64' id='type-id-3086'/>
+    <pointer-type-def type-id='type-id-3017' size-in-bits='64' id='type-id-3048'/>
+    <qualified-type-def type-id='type-id-3017' const='yes' id='type-id-3168'/>
+    <pointer-type-def type-id='type-id-3168' size-in-bits='64' id='type-id-3049'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3028' size-in-bits='64' id='type-id-3050'/>
+    <qualified-type-def type-id='type-id-3038' const='yes' id='type-id-3169'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3169' size-in-bits='64' id='type-id-3051'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3168' size-in-bits='64' id='type-id-3052'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3017' size-in-bits='64' id='type-id-3053'/>
+    <qualified-type-def type-id='type-id-3030' const='yes' id='type-id-3170'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3170' size-in-bits='64' id='type-id-3054'/>
+    <pointer-type-def type-id='type-id-3088' size-in-bits='64' id='type-id-3090'/>
+    <qualified-type-def type-id='type-id-3095' const='yes' id='type-id-3171'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3171' size-in-bits='64' id='type-id-3091'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3095' size-in-bits='64' id='type-id-3092'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3088' size-in-bits='64' id='type-id-3093'/>
+    <pointer-type-def type-id='type-id-3087' size-in-bits='64' id='type-id-3098'/>
+    <qualified-type-def type-id='type-id-3087' const='yes' id='type-id-3172'/>
+    <pointer-type-def type-id='type-id-3172' size-in-bits='64' id='type-id-3099'/>
+    <qualified-type-def type-id='type-id-3097' const='yes' id='type-id-3173'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3173' size-in-bits='64' id='type-id-3100'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3087' size-in-bits='64' id='type-id-3101'/>
+    <pointer-type-def type-id='type-id-3108' size-in-bits='64' id='type-id-3109'/>
+    <pointer-type-def type-id='type-id-3111' size-in-bits='64' id='type-id-3112'/>
+    <pointer-type-def type-id='type-id-3174' size-in-bits='64' id='type-id-3113'/>
+    <pointer-type-def type-id='type-id-3175' size-in-bits='64' id='type-id-3110'/>
+    <function-type size-in-bits='64' id='type-id-3117'>
       <parameter type-id='type-id-1676'/>
-      <parameter type-id='type-id-2996'/>
+      <parameter type-id='type-id-2995'/>
       <return type-id='type-id-23'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-3116'>
+    <function-type size-in-bits='64' id='type-id-3115'>
       <parameter type-id='type-id-1676'/>
+      <parameter type-id='type-id-2995'/>
       <parameter type-id='type-id-2996'/>
-      <parameter type-id='type-id-2997'/>
       <return type-id='type-id-4'/>
     </function-type>
-    <pointer-type-def type-id='type-id-3016' size-in-bits='64' id='type-id-3017'/>
-    <qualified-type-def type-id='type-id-3112' const='yes' id='type-id-3175'/>
-    <qualified-type-def type-id='type-id-3109' const='yes' id='type-id-3176'/>
+    <pointer-type-def type-id='type-id-3015' size-in-bits='64' id='type-id-3016'/>
+    <qualified-type-def type-id='type-id-3111' const='yes' id='type-id-3174'/>
+    <qualified-type-def type-id='type-id-3108' const='yes' id='type-id-3175'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/functional.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'>
 
@@ -46471,9 +46470,9 @@
 
 
 
-      <class-decl name='__add_ref&lt;std::__future_base::_Result_base*&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='56' column='1' id='type-id-3177'>
+      <class-decl name='__add_ref&lt;std::__future_base::_Result_base*&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='56' column='1' id='type-id-3176'>
         <member-type access='public'>
-          <typedef-decl name='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/tuple' line='57' column='1' id='type-id-3178'/>
+          <typedef-decl name='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/tuple' line='57' column='1' id='type-id-3177'/>
         </member-type>
       </class-decl>
       <class-decl name='__add_lvalue_reference_helper&lt;std::__future_base::_State_base, true, false&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='1345' column='1' id='type-id-1760'>
@@ -46503,47 +46502,47 @@
       </class-decl>
       <function-decl name='__get_helper&lt;0ul, 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='728' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-1726'/>
-        <return type-id='type-id-3178'/>
+        <return type-id='type-id-3177'/>
       </function-decl>
-      <class-decl name='__add_ref&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/tuple' line='56' column='1' id='type-id-3179'>
+      <class-decl name='__add_ref&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/tuple' line='56' column='1' id='type-id-3178'>
         <member-type access='public'>
-          <typedef-decl name='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/tuple' line='57' column='1' id='type-id-3180'/>
+          <typedef-decl name='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/tuple' line='57' column='1' id='type-id-3179'/>
         </member-type>
       </class-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-1734'/>
-        <return type-id='type-id-3180'/>
+        <return type-id='type-id-3179'/>
       </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'>
         <parameter type-id='type-id-1664'/>
-        <return type-id='type-id-3180'/>
+        <return type-id='type-id-3179'/>
       </function-decl>
       <function-decl name='get&lt;0ul, 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'>
         <parameter type-id='type-id-1664'/>
-        <return type-id='type-id-3178'/>
+        <return type-id='type-id-3177'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-1466' const='yes' id='type-id-3181'/>
+    <qualified-type-def type-id='type-id-1466' const='yes' id='type-id-3180'/>
 
 
 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hash_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/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
-      <class-decl name='hash&lt;long double&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/functional_hash.h' line='193' column='1' id='type-id-3182'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3183'/>
+      <class-decl name='hash&lt;long double&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/functional_hash.h' line='193' column='1' id='type-id-3181'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-3182'/>
         <member-function access='public' const='yes'>
           <function-decl name='operator()' mangled-name='_ZNKSt4hashIeEclEe' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/functional_hash.h' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt4hashIeEclEe@@GLIBCXX_3.4.10'>
-            <parameter type-id='type-id-3184' is-artificial='yes'/>
+            <parameter type-id='type-id-3183' is-artificial='yes'/>
             <parameter type-id='type-id-539'/>
             <return type-id='type-id-66'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='__hash_base&lt;long unsigned int, long double&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/functional_hash.h' line='50' column='1' id='type-id-3183'/>
+      <class-decl name='__hash_base&lt;long unsigned int, long double&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/functional_hash.h' line='50' column='1' id='type-id-3182'/>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-3182' const='yes' id='type-id-3185'/>
-    <pointer-type-def type-id='type-id-3185' size-in-bits='64' id='type-id-3184'/>
+    <qualified-type-def type-id='type-id-3181' const='yes' id='type-id-3184'/>
+    <pointer-type-def type-id='type-id-3184' size-in-bits='64' id='type-id-3183'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/hashtable_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/c++11' language='LANG_C_plus_plus'>
     <namespace-decl name='std'>
@@ -46554,7 +46553,7 @@
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/limits.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'>
     <namespace-decl name='std'>
-      <class-decl name='__numeric_limits_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/limits' line='192' column='1' id='type-id-3186'>
+      <class-decl name='__numeric_limits_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/limits' line='192' column='1' id='type-id-3185'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt21__numeric_limits_base14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='196' column='1' elf-symbol-id='_ZNSt21__numeric_limits_base14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -46625,7 +46624,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt21__numeric_limits_base11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='289' column='1' elf-symbol-id='_ZNSt21__numeric_limits_base11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;bool&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='371' column='1' id='type-id-3187'>
+      <class-decl name='numeric_limits&lt;bool&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='371' column='1' id='type-id-3186'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIbE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='373' column='1' elf-symbol-id='_ZNSt14numeric_limitsIbE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -46696,7 +46695,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIbE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='435' column='1' elf-symbol-id='_ZNSt14numeric_limitsIbE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;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/limits' line='440' column='1' id='type-id-3188'>
+      <class-decl name='numeric_limits&lt;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/limits' line='440' column='1' id='type-id-3187'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIcE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='442' column='1' elf-symbol-id='_ZNSt14numeric_limitsIcE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -46767,7 +46766,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIcE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='502' column='1' elf-symbol-id='_ZNSt14numeric_limitsIcE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;signed 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/limits' line='507' column='1' id='type-id-3189'>
+      <class-decl name='numeric_limits&lt;signed 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/limits' line='507' column='1' id='type-id-3188'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIaE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='509' column='1' elf-symbol-id='_ZNSt14numeric_limitsIaE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -46838,7 +46837,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIaE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='572' column='1' elf-symbol-id='_ZNSt14numeric_limitsIaE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;unsigned 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/limits' line='577' column='1' id='type-id-3190'>
+      <class-decl name='numeric_limits&lt;unsigned 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/limits' line='577' column='1' id='type-id-3189'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIhE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='579' column='1' elf-symbol-id='_ZNSt14numeric_limitsIhE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -46909,7 +46908,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIhE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='645' column='1' elf-symbol-id='_ZNSt14numeric_limitsIhE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;wchar_t&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='650' column='1' id='type-id-3191'>
+      <class-decl name='numeric_limits&lt;wchar_t&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='650' column='1' id='type-id-3190'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIwE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='652' column='1' elf-symbol-id='_ZNSt14numeric_limitsIwE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -46980,7 +46979,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIwE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='713' column='1' elf-symbol-id='_ZNSt14numeric_limitsIwE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;char16_t&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='719' column='1' id='type-id-3192'>
+      <class-decl name='numeric_limits&lt;char16_t&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='719' column='1' id='type-id-3191'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIDsE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='721' column='1' elf-symbol-id='_ZNSt14numeric_limitsIDsE14is_specializedE@@GLIBCXX_3.4.11'/>
         </data-member>
@@ -47051,7 +47050,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIDsE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='775' column='1' elf-symbol-id='_ZNSt14numeric_limitsIDsE11round_styleE@@GLIBCXX_3.4.11'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;char32_t&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='780' column='1' id='type-id-3193'>
+      <class-decl name='numeric_limits&lt;char32_t&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='780' column='1' id='type-id-3192'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIDiE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='782' column='1' elf-symbol-id='_ZNSt14numeric_limitsIDiE14is_specializedE@@GLIBCXX_3.4.11'/>
         </data-member>
@@ -47122,7 +47121,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIDiE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='836' column='1' elf-symbol-id='_ZNSt14numeric_limitsIDiE11round_styleE@@GLIBCXX_3.4.11'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;short 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='842' column='1' id='type-id-3194'>
+      <class-decl name='numeric_limits&lt;short 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='842' column='1' id='type-id-3193'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIsE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='844' column='1' elf-symbol-id='_ZNSt14numeric_limitsIsE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -47193,7 +47192,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIsE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='904' column='1' elf-symbol-id='_ZNSt14numeric_limitsIsE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;short unsigned 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='909' column='1' id='type-id-3195'>
+      <class-decl name='numeric_limits&lt;short unsigned 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='909' column='1' id='type-id-3194'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsItE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='911' column='1' elf-symbol-id='_ZNSt14numeric_limitsItE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -47264,7 +47263,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsItE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='977' column='1' elf-symbol-id='_ZNSt14numeric_limitsItE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;unsigned 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='1049' column='1' id='type-id-3196'>
+      <class-decl name='numeric_limits&lt;unsigned 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='1049' column='1' id='type-id-3195'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIjE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1051' column='1' elf-symbol-id='_ZNSt14numeric_limitsIjE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -47335,7 +47334,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIjE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1116' column='1' elf-symbol-id='_ZNSt14numeric_limitsIjE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;long unsigned 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='1188' column='1' id='type-id-3197'>
+      <class-decl name='numeric_limits&lt;long unsigned 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='1188' column='1' id='type-id-3196'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsImE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1190' column='1' elf-symbol-id='_ZNSt14numeric_limitsImE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -47406,7 +47405,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsImE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1256' column='1' elf-symbol-id='_ZNSt14numeric_limitsImE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;long long 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='1261' column='1' id='type-id-3198'>
+      <class-decl name='numeric_limits&lt;long long 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='1261' column='1' id='type-id-3197'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIxE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1263' column='1' elf-symbol-id='_ZNSt14numeric_limitsIxE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -47477,7 +47476,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIxE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1326' column='1' elf-symbol-id='_ZNSt14numeric_limitsIxE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;long long unsigned 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='1331' column='1' id='type-id-3199'>
+      <class-decl name='numeric_limits&lt;long long unsigned 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='1331' column='1' id='type-id-3198'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIyE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1333' column='1' elf-symbol-id='_ZNSt14numeric_limitsIyE14is_specializedE@@GLIBCXX_3.4'/>
         </data-member>
@@ -47548,7 +47547,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsIyE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1399' column='1' elf-symbol-id='_ZNSt14numeric_limitsIyE11round_styleE@@GLIBCXX_3.4'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;__int128&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='1405' column='1' id='type-id-3200'>
+      <class-decl name='numeric_limits&lt;__int128&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='1405' column='1' id='type-id-3199'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsInE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1407' column='1' elf-symbol-id='_ZNSt14numeric_limitsInE14is_specializedE@@GLIBCXX_3.4.17'/>
         </data-member>
@@ -47619,7 +47618,7 @@
           <var-decl name='round_style' type-id='type-id-2327' mangled-name='_ZNSt14numeric_limitsInE11round_styleE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1474' column='1' elf-symbol-id='_ZNSt14numeric_limitsInE11round_styleE@@GLIBCXX_3.4.17'/>
         </data-member>
       </class-decl>
-      <class-decl name='numeric_limits&lt;__int128 unsigned&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='1479' column='1' id='type-id-3201'>
+      <class-decl name='numeric_limits&lt;__int128 unsigned&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='1479' column='1' id='type-id-3200'>
         <data-member access='public' static='yes'>
           <var-decl name='is_specialized' type-id='type-id-1006' mangled-name='_ZNSt14numeric_limitsIoE14is_specializedE' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/limits' line='1481' column='1' elf-symbol-id='_ZNSt14numeric_limitsIoE14is_specializedE@@GLIBCXX_3.4.17'/>
         </data-member>
@@ -47710,66 +47709,67 @@
     <namespace-decl name='std'>
 
       <namespace-decl name='placeholders'>
-        <var-decl name='_1' type-id='type-id-3202' mangled-name='_ZNSt12placeholders2_1E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='36' column='1' elf-symbol-id='_ZNSt12placeholders2_1E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_2' type-id='type-id-3203' mangled-name='_ZNSt12placeholders2_2E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='37' column='1' elf-symbol-id='_ZNSt12placeholders2_2E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_3' type-id='type-id-3204' mangled-name='_ZNSt12placeholders2_3E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='38' column='1' elf-symbol-id='_ZNSt12placeholders2_3E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_4' type-id='type-id-3205' mangled-name='_ZNSt12placeholders2_4E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='39' column='1' elf-symbol-id='_ZNSt12placeholders2_4E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_5' type-id='type-id-3206' mangled-name='_ZNSt12placeholders2_5E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='40' column='1' elf-symbol-id='_ZNSt12placeholders2_5E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_6' type-id='type-id-3207' mangled-name='_ZNSt12placeholders2_6E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='41' column='1' elf-symbol-id='_ZNSt12placeholders2_6E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_7' type-id='type-id-3208' mangled-name='_ZNSt12placeholders2_7E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='42' column='1' elf-symbol-id='_ZNSt12placeholders2_7E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_8' type-id='type-id-3209' mangled-name='_ZNSt12placeholders2_8E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='43' column='1' elf-symbol-id='_ZNSt12placeholders2_8E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_9' type-id='type-id-3210' mangled-name='_ZNSt12placeholders2_9E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='44' column='1' elf-symbol-id='_ZNSt12placeholders2_9E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_10' type-id='type-id-3211' mangled-name='_ZNSt12placeholders3_10E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='45' column='1' elf-symbol-id='_ZNSt12placeholders3_10E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_11' type-id='type-id-3212' mangled-name='_ZNSt12placeholders3_11E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='46' column='1' elf-symbol-id='_ZNSt12placeholders3_11E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_12' type-id='type-id-3213' mangled-name='_ZNSt12placeholders3_12E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='47' column='1' elf-symbol-id='_ZNSt12placeholders3_12E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_13' type-id='type-id-3214' mangled-name='_ZNSt12placeholders3_13E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='48' column='1' elf-symbol-id='_ZNSt12placeholders3_13E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_14' type-id='type-id-3215' mangled-name='_ZNSt12placeholders3_14E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='49' column='1' elf-symbol-id='_ZNSt12placeholders3_14E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_15' type-id='type-id-3216' mangled-name='_ZNSt12placeholders3_15E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='50' column='1' elf-symbol-id='_ZNSt12placeholders3_15E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_16' type-id='type-id-3217' mangled-name='_ZNSt12placeholders3_16E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='51' column='1' elf-symbol-id='_ZNSt12placeholders3_16E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_17' type-id='type-id-3218' mangled-name='_ZNSt12placeholders3_17E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='52' column='1' elf-symbol-id='_ZNSt12placeholders3_17E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_18' type-id='type-id-3219' mangled-name='_ZNSt12placeholders3_18E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='53' column='1' elf-symbol-id='_ZNSt12placeholders3_18E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_19' type-id='type-id-3220' mangled-name='_ZNSt12placeholders3_19E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='54' column='1' elf-symbol-id='_ZNSt12placeholders3_19E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_20' type-id='type-id-3221' mangled-name='_ZNSt12placeholders3_20E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='55' column='1' elf-symbol-id='_ZNSt12placeholders3_20E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_21' type-id='type-id-3222' mangled-name='_ZNSt12placeholders3_21E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='56' column='1' elf-symbol-id='_ZNSt12placeholders3_21E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_22' type-id='type-id-3223' mangled-name='_ZNSt12placeholders3_22E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='57' column='1' elf-symbol-id='_ZNSt12placeholders3_22E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_23' type-id='type-id-3224' mangled-name='_ZNSt12placeholders3_23E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='58' column='1' elf-symbol-id='_ZNSt12placeholders3_23E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_24' type-id='type-id-3225' mangled-name='_ZNSt12placeholders3_24E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='59' column='1' elf-symbol-id='_ZNSt12placeholders3_24E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_25' type-id='type-id-3226' mangled-name='_ZNSt12placeholders3_25E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='60' column='1' elf-symbol-id='_ZNSt12placeholders3_25E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_26' type-id='type-id-3227' mangled-name='_ZNSt12placeholders3_26E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='61' column='1' elf-symbol-id='_ZNSt12placeholders3_26E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_27' type-id='type-id-3228' mangled-name='_ZNSt12placeholders3_27E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='62' column='1' elf-symbol-id='_ZNSt12placeholders3_27E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_28' type-id='type-id-3229' mangled-name='_ZNSt12placeholders3_28E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='63' column='1' elf-symbol-id='_ZNSt12placeholders3_28E@@GLIBCXX_3.4.15'/>
-        <var-decl name='_29' type-id='type-id-3230' mangled-name='_ZNSt12placeholders3_29E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='64' column='1' elf-symbol-id='_ZNSt12placeholders3_29E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_1' type-id='type-id-3201' mangled-name='_ZNSt12placeholders2_1E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='36' column='1' elf-symbol-id='_ZNSt12placeholders2_1E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_2' type-id='type-id-3202' mangled-name='_ZNSt12placeholders2_2E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='37' column='1' elf-symbol-id='_ZNSt12placeholders2_2E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_3' type-id='type-id-3203' mangled-name='_ZNSt12placeholders2_3E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='38' column='1' elf-symbol-id='_ZNSt12placeholders2_3E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_4' type-id='type-id-3204' mangled-name='_ZNSt12placeholders2_4E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='39' column='1' elf-symbol-id='_ZNSt12placeholders2_4E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_5' type-id='type-id-3205' mangled-name='_ZNSt12placeholders2_5E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='40' column='1' elf-symbol-id='_ZNSt12placeholders2_5E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_6' type-id='type-id-3206' mangled-name='_ZNSt12placeholders2_6E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='41' column='1' elf-symbol-id='_ZNSt12placeholders2_6E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_7' type-id='type-id-3207' mangled-name='_ZNSt12placeholders2_7E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='42' column='1' elf-symbol-id='_ZNSt12placeholders2_7E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_8' type-id='type-id-3208' mangled-name='_ZNSt12placeholders2_8E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='43' column='1' elf-symbol-id='_ZNSt12placeholders2_8E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_9' type-id='type-id-3209' mangled-name='_ZNSt12placeholders2_9E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='44' column='1' elf-symbol-id='_ZNSt12placeholders2_9E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_10' type-id='type-id-3210' mangled-name='_ZNSt12placeholders3_10E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='45' column='1' elf-symbol-id='_ZNSt12placeholders3_10E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_11' type-id='type-id-3211' mangled-name='_ZNSt12placeholders3_11E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='46' column='1' elf-symbol-id='_ZNSt12placeholders3_11E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_12' type-id='type-id-3212' mangled-name='_ZNSt12placeholders3_12E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='47' column='1' elf-symbol-id='_ZNSt12placeholders3_12E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_13' type-id='type-id-3213' mangled-name='_ZNSt12placeholders3_13E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='48' column='1' elf-symbol-id='_ZNSt12placeholders3_13E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_14' type-id='type-id-3214' mangled-name='_ZNSt12placeholders3_14E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='49' column='1' elf-symbol-id='_ZNSt12placeholders3_14E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_15' type-id='type-id-3215' mangled-name='_ZNSt12placeholders3_15E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='50' column='1' elf-symbol-id='_ZNSt12placeholders3_15E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_16' type-id='type-id-3216' mangled-name='_ZNSt12placeholders3_16E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='51' column='1' elf-symbol-id='_ZNSt12placeholders3_16E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_17' type-id='type-id-3217' mangled-name='_ZNSt12placeholders3_17E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='52' column='1' elf-symbol-id='_ZNSt12placeholders3_17E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_18' type-id='type-id-3218' mangled-name='_ZNSt12placeholders3_18E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='53' column='1' elf-symbol-id='_ZNSt12placeholders3_18E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_19' type-id='type-id-3219' mangled-name='_ZNSt12placeholders3_19E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='54' column='1' elf-symbol-id='_ZNSt12placeholders3_19E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_20' type-id='type-id-3220' mangled-name='_ZNSt12placeholders3_20E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='55' column='1' elf-symbol-id='_ZNSt12placeholders3_20E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_21' type-id='type-id-3221' mangled-name='_ZNSt12placeholders3_21E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='56' column='1' elf-symbol-id='_ZNSt12placeholders3_21E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_22' type-id='type-id-3222' mangled-name='_ZNSt12placeholders3_22E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='57' column='1' elf-symbol-id='_ZNSt12placeholders3_22E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_23' type-id='type-id-3223' mangled-name='_ZNSt12placeholders3_23E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='58' column='1' elf-symbol-id='_ZNSt12placeholders3_23E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_24' type-id='type-id-3224' mangled-name='_ZNSt12placeholders3_24E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='59' column='1' elf-symbol-id='_ZNSt12placeholders3_24E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_25' type-id='type-id-3225' mangled-name='_ZNSt12placeholders3_25E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='60' column='1' elf-symbol-id='_ZNSt12placeholders3_25E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_26' type-id='type-id-3226' mangled-name='_ZNSt12placeholders3_26E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='61' column='1' elf-symbol-id='_ZNSt12placeholders3_26E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_27' type-id='type-id-3227' mangled-name='_ZNSt12placeholders3_27E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='62' column='1' elf-symbol-id='_ZNSt12placeholders3_27E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_28' type-id='type-id-3228' mangled-name='_ZNSt12placeholders3_28E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='63' column='1' elf-symbol-id='_ZNSt12placeholders3_28E@@GLIBCXX_3.4.15'/>
+        <var-decl name='_29' type-id='type-id-3229' mangled-name='_ZNSt12placeholders3_29E' visibility='default' filepath='../../../.././libstdc++-v3/src/c++11/placeholders.cc' line='64' column='1' elf-symbol-id='_ZNSt12placeholders3_29E@@GLIBCXX_3.4.15'/>
       </namespace-decl>
-      <class-decl name='_Placeholder&lt;1&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/functional' line='849' column='1' id='type-id-3231'/>
-      <class-decl name='_Placeholder&lt;2&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/functional' line='849' column='1' id='type-id-3232'/>
-      <class-decl name='_Placeholder&lt;3&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/functional' line='849' column='1' id='type-id-3233'/>
-      <class-decl name='_Placeholder&lt;4&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/functional' line='849' column='1' id='type-id-3234'/>
-      <class-decl name='_Placeholder&lt;5&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/functional' line='849' column='1' id='type-id-3235'/>
-      <class-decl name='_Placeholder&lt;6&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/functional' line='849' column='1' id='type-id-3236'/>
-      <class-decl name='_Placeholder&lt;7&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/functional' line='849' column='1' id='type-id-3237'/>
-      <class-decl name='_Placeholder&lt;8&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/functional' line='849' column='1' id='type-id-3238'/>
-      <class-decl name='_Placeholder&lt;9&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/functional' line='849' column='1' id='type-id-3239'/>
-      <class-decl name='_Placeholder&lt;10&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/functional' line='849' column='1' id='type-id-3240'/>
-      <class-decl name='_Placeholder&lt;11&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/functional' line='849' column='1' id='type-id-3241'/>
-      <class-decl name='_Placeholder&lt;12&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/functional' line='849' column='1' id='type-id-3242'/>
-      <class-decl name='_Placeholder&lt;13&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/functional' line='849' column='1' id='type-id-3243'/>
-      <class-decl name='_Placeholder&lt;14&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/functional' line='849' column='1' id='type-id-3244'/>
-      <class-decl name='_Placeholder&lt;15&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/functional' line='849' column='1' id='type-id-3245'/>
-      <class-decl name='_Placeholder&lt;16&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/functional' line='849' column='1' id='type-id-3246'/>
-      <class-decl name='_Placeholder&lt;17&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/functional' line='849' column='1' id='type-id-3247'/>
-      <class-decl name='_Placeholder&lt;18&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/functional' line='849' column='1' id='type-id-3248'/>
-      <class-decl name='_Placeholder&lt;19&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/functional' line='849' column='1' id='type-id-3249'/>
-      <class-decl name='_Placeholder&lt;20&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/functional' line='849' column='1' id='type-id-3250'/>
-      <class-decl name='_Placeholder&lt;21&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/functional' line='849' column='1' id='type-id-3251'/>
-      <class-decl name='_Placeholder&lt;22&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/functional' line='849' column='1' id='type-id-3252'/>
-      <class-decl name='_Placeholder&lt;23&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/functional' line='849' column='1' id='type-id-3253'/>
-      <class-decl name='_Placeholder&lt;24&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/functional' line='849' column='1' id='type-id-3254'/>
-      <class-decl name='_Placeholder&lt;25&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/functional' line='849' column='1' id='type-id-3255'/>
-      <class-decl name='_Placeholder&lt;26&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/functional' line='849' column='1' id='type-id-3256'/>
-      <class-decl name='_Placeholder&lt;27&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/functional' line='849' column='1' id='type-id-3257'/>
-      <class-decl name='_Placeholder&lt;28&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/functional' line='849' column='1' id='type-id-3258'/>
-      <class-decl name='_Placeholder&lt;29&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/functional' line='849' column='1' id='type-id-3259'/>
-    </namespace-decl>
+      <class-decl name='_Placeholder&lt;1&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/functional' line='849' column='1' id='type-id-3230'/>
+      <class-decl name='_Placeholder&lt;2&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/functional' line='849' column='1' id='type-id-3231'/>
+      <class-decl name='_Placeholder&lt;3&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/functional' line='849' column='1' id='type-id-3232'/>
+      <class-decl name='_Placeholder&lt;4&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/functional' line='849' column='1' id='type-id-3233'/>
+      <class-decl name='_Placeholder&lt;5&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/functional' line='849' column='1' id='type-id-3234'/>
+      <class-decl name='_Placeholder&lt;6&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/functional' line='849' column='1' id='type-id-3235'/>
+      <class-decl name='_Placeholder&lt;7&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/functional' line='849' column='1' id='type-id-3236'/>
+      <class-decl name='_Placeholder&lt;8&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/functional' line='849' column='1' id='type-id-3237'/>
+      <class-decl name='_Placeholder&lt;9&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/functional' line='849' column='1' id='type-id-3238'/>
+      <class-decl name='_Placeholder&lt;10&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/functional' line='849' column='1' id='type-id-3239'/>
+      <class-decl name='_Placeholder&lt;11&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/functional' line='849' column='1' id='type-id-3240'/>
+      <class-decl name='_Placeholder&lt;12&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/functional' line='849' column='1' id='type-id-3241'/>
+      <class-decl name='_Placeholder&lt;13&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/functional' line='849' column='1' id='type-id-3242'/>
+      <class-decl name='_Placeholder&lt;14&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/functional' line='849' column='1' id='type-id-3243'/>
+      <class-decl name='_Placeholder&lt;15&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/functional' line='849' column='1' id='type-id-3244'/>
+      <class-decl name='_Placeholder&lt;16&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/functional' line='849' column='1' id='type-id-3245'/>
+      <class-decl name='_Placeholder&lt;17&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/functional' line='849' column='1' id='type-id-3246'/>
+      <class-decl name='_Placeholder&lt;18&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/functional' line='849' column='1' id='type-id-3247'/>
+      <class-decl name='_Placeholder&lt;19&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/functional' line='849' column='1' id='type-id-3248'/>
+      <class-decl name='_Placeholder&lt;20&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/functional' line='849' column='1' id='type-id-3249'/>
+      <class-decl name='_Placeholder&lt;21&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/functional' line='849' column='1' id='type-id-3250'/>
+      <class-decl name='_Placeholder&lt;22&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/functional' line='849' column='1' id='type-id-3251'/>
+      <class-decl name='_Placeholder&lt;23&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/functional' line='849' column='1' id='type-id-3252'/>
+      <class-decl name='_Placeholder&lt;24&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/functional' line='849' column='1' id='type-id-3253'/>
+      <class-decl name='_Placeholder&lt;25&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/functional' line='849' column='1' id='type-id-3254'/>
+      <class-decl name='_Placeholder&lt;26&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/functional' line='849' column='1' id='type-id-3255'/>
+      <class-decl name='_Placeholder&lt;27&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/functional' line='849' column='1' id='type-id-3256'/>
+      <class-decl name='_Placeholder&lt;28&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/functional' line='849' column='1' id='type-id-3257'/>
+      <class-decl name='_Placeholder&lt;29&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/functional' line='849' column='1' id='type-id-3258'/>
+    </namespace-decl>
+    <qualified-type-def type-id='type-id-3230' const='yes' id='type-id-3201'/>
     <qualified-type-def type-id='type-id-3231' const='yes' id='type-id-3202'/>
     <qualified-type-def type-id='type-id-3232' const='yes' id='type-id-3203'/>
     <qualified-type-def type-id='type-id-3233' const='yes' id='type-id-3204'/>
@@ -47798,7 +47798,6 @@
     <qualified-type-def type-id='type-id-3256' const='yes' id='type-id-3227'/>
     <qualified-type-def type-id='type-id-3257' const='yes' id='type-id-3228'/>
     <qualified-type-def type-id='type-id-3258' const='yes' id='type-id-3229'/>
-    <qualified-type-def type-id='type-id-3259' const='yes' id='type-id-3230'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/regex.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'>
     <namespace-decl name='std'>
@@ -47809,48 +47808,48 @@
 
 
 
-      <class-decl name='regex_error' 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/regex_error.h' line='131' column='1' id='type-id-3260'>
+      <class-decl name='regex_error' 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/regex_error.h' line='131' column='1' id='type-id-3259'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2347'/>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_code' type-id='type-id-2965' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_error.h' line='133' column='1'/>
+          <var-decl name='_M_code' type-id='type-id-2964' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_error.h' line='133' column='1'/>
         </data-member>
         <member-function access='private' constructor='yes'>
           <function-decl name='regex_error' filepath='../../../.././libstdc++-v3/src/c++11/regex.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3261' is-artificial='yes'/>
-            <parameter type-id='type-id-2965'/>
+            <parameter type-id='type-id-3260' is-artificial='yes'/>
+            <parameter type-id='type-id-2964'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='code' mangled-name='_ZNKSt11regex_error4codeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/bits/regex_error.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3262' is-artificial='yes'/>
-            <return type-id='type-id-2965'/>
+            <parameter type-id='type-id-3261' is-artificial='yes'/>
+            <return type-id='type-id-2964'/>
           </function-decl>
         </member-function>
         <member-function access='private' constructor='yes'>
           <function-decl name='regex_error' mangled-name='_ZNSt11regex_errorC2ENSt15regex_constants10error_typeE' filepath='../../../.././libstdc++-v3/src/c++11/regex.cc' line='31' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3261' is-artificial='yes'/>
-            <parameter type-id='type-id-2965'/>
+            <parameter type-id='type-id-3260' is-artificial='yes'/>
+            <parameter type-id='type-id-2964'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~regex_error' filepath='../../../.././libstdc++-v3/src/c++11/regex.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3261' is-artificial='yes'/>
+            <parameter type-id='type-id-3260' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~regex_error' mangled-name='_ZNSt11regex_errorD0Ev' filepath='../../../.././libstdc++-v3/src/c++11/regex.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11regex_errorD0Ev@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3261' is-artificial='yes'/>
+            <parameter type-id='type-id-3260' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~regex_error' mangled-name='_ZNSt11regex_errorD2Ev' filepath='../../../.././libstdc++-v3/src/c++11/regex.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt11regex_errorD1Ev@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3261' is-artificial='yes'/>
+            <parameter type-id='type-id-3260' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
@@ -47859,40 +47858,40 @@
     </namespace-decl>
 
 
-    <pointer-type-def type-id='type-id-3260' size-in-bits='64' id='type-id-3261'/>
-    <qualified-type-def type-id='type-id-3260' const='yes' id='type-id-3263'/>
-    <pointer-type-def type-id='type-id-3263' size-in-bits='64' id='type-id-3262'/>
+    <pointer-type-def type-id='type-id-3259' size-in-bits='64' id='type-id-3260'/>
+    <qualified-type-def type-id='type-id-3259' const='yes' id='type-id-3262'/>
+    <pointer-type-def type-id='type-id-3262' size-in-bits='64' id='type-id-3261'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/shared_ptr.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'>
     <namespace-decl name='std'>
 
 
-      <class-decl name='bad_weak_ptr' 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/shared_ptr_base.h' line='61' column='1' id='type-id-3264'>
+      <class-decl name='bad_weak_ptr' 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/shared_ptr_base.h' line='61' column='1' id='type-id-3263'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-86'/>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_weak_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='61' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3265' is-artificial='yes'/>
+            <parameter type-id='type-id-3264' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_weak_ptr' mangled-name='_ZNSt12bad_weak_ptrD0Ev' 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='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12bad_weak_ptrD0Ev@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3265' is-artificial='yes'/>
+            <parameter type-id='type-id-3264' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~bad_weak_ptr' mangled-name='_ZNSt12bad_weak_ptrD2Ev' 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='61' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt12bad_weak_ptrD2Ev@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3265' is-artificial='yes'/>
+            <parameter type-id='type-id-3264' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes' vtable-offset='2'>
           <function-decl name='what' mangled-name='_ZNKSt12bad_weak_ptr4whatEv' filepath='../../../.././libstdc++-v3/src/c++11/shared_ptr.cc' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt12bad_weak_ptr4whatEv@@GLIBCXX_3.4.15'>
-            <parameter type-id='type-id-3266' is-artificial='yes'/>
+            <parameter type-id='type-id-3265' is-artificial='yes'/>
             <return type-id='type-id-11'/>
           </function-decl>
         </member-function>
@@ -47900,9 +47899,9 @@
     </namespace-decl>
 
 
-    <qualified-type-def type-id='type-id-3264' const='yes' id='type-id-3267'/>
-    <pointer-type-def type-id='type-id-3267' size-in-bits='64' id='type-id-3266'/>
-    <pointer-type-def type-id='type-id-3264' size-in-bits='64' id='type-id-3265'/>
+    <qualified-type-def type-id='type-id-3263' const='yes' id='type-id-3266'/>
+    <pointer-type-def type-id='type-id-3266' size-in-bits='64' id='type-id-3265'/>
+    <pointer-type-def type-id='type-id-3263' size-in-bits='64' id='type-id-3264'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/system_error.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'>
     <namespace-decl name='std'>
@@ -47937,23 +47936,23 @@
         <parameter type-id='type-id-1319'/>
         <return type-id='type-id-23'/>
       </function-decl>
-      <class-decl name='remove_reference&lt;std::thread::_Impl_base*&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/type_traits' line='1330' column='1' id='type-id-3268'>
+      <class-decl name='remove_reference&lt;std::thread::_Impl_base*&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/type_traits' line='1330' column='1' id='type-id-3267'>
         <member-type access='public'>
-          <typedef-decl name='type' type-id='type-id-1325' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-3269'/>
+          <typedef-decl name='type' type-id='type-id-1325' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/type_traits' line='1331' column='1' id='type-id-3268'/>
         </member-type>
       </class-decl>
       <function-decl name='move&lt;std::thread::_Impl_base*&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-3270'/>
-        <return type-id='type-id-3271'/>
+        <parameter type-id='type-id-3269'/>
+        <return type-id='type-id-3270'/>
       </function-decl>
       <function-decl name='swap&lt;std::thread::_Impl_base*&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-3270'/>
-        <parameter type-id='type-id-3270'/>
+        <parameter type-id='type-id-3269'/>
+        <parameter type-id='type-id-3269'/>
         <return type-id='type-id-4'/>
       </function-decl>
     </namespace-decl>
-    <reference-type-def kind='lvalue' type-id='type-id-3269' size-in-bits='64' id='type-id-3271'/>
-    <reference-type-def kind='lvalue' type-id='type-id-1325' size-in-bits='64' id='type-id-3270'/>
+    <reference-type-def kind='lvalue' type-id='type-id-3268' size-in-bits='64' id='type-id-3270'/>
+    <reference-type-def kind='lvalue' type-id='type-id-1325' size-in-bits='64' id='type-id-3269'/>
 
 
 
@@ -47966,8 +47965,8 @@
 
 
       <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-608'/>
-        <return type-id='type-id-2735'/>
+        <parameter type-id='type-id-609'/>
+        <return type-id='type-id-2734'/>
       </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'>
         <parameter type-id='type-id-867'/>
@@ -47975,20 +47974,20 @@
         <return type-id='type-id-23'/>
       </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-624'/>
-        <return type-id='type-id-2841'/>
+        <parameter type-id='type-id-625'/>
+        <return type-id='type-id-2840'/>
       </function-decl>
-      <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-3272'>
+      <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-3271'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2374'/>
         <member-type access='private'>
-          <typedef-decl name='__filebuf_type' type-id='type-id-379' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='772' column='1' id='type-id-3273'/>
+          <typedef-decl name='__filebuf_type' type-id='type-id-379' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='772' column='1' id='type-id-3272'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_filebuf' type-id='type-id-3273' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='777' column='1'/>
+          <var-decl name='_M_filebuf' type-id='type-id-3272' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='777' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -47996,7 +47995,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48006,7 +48005,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48016,25 +48015,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt13basic_fstreamIcSt11char_traitsIcEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='842' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_fstreamIcSt11char_traitsIcEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3275' is-artificial='yes'/>
-            <return type-id='type-id-3276'/>
+            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <return type-id='type-id-3275'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_fstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3275' is-artificial='yes'/>
+            <parameter type-id='type-id-3274' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='871' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48042,7 +48041,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEE4openERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEE4openERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48050,13 +48049,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48064,7 +48063,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48072,7 +48071,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48082,7 +48081,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48092,7 +48091,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48102,7 +48101,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48112,7 +48111,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48120,7 +48119,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48128,7 +48127,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48136,24 +48135,24 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIcSt11char_traitsIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIcSt11char_traitsIcEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3274' is-artificial='yes'/>
+            <parameter type-id='type-id-3273' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-3277'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-773'/>
+      <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-3276'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-774'/>
         <member-type access='private'>
-          <typedef-decl name='__filebuf_type' type-id='type-id-379' 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-3278'/>
+          <typedef-decl name='__filebuf_type' type-id='type-id-379' 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-3277'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_filebuf' type-id='type-id-3278' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='603' column='1'/>
+          <var-decl name='_M_filebuf' type-id='type-id-3277' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='603' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48161,7 +48160,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48171,7 +48170,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48181,25 +48180,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt14basic_ofstreamIcSt11char_traitsIcEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='673' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ofstreamIcSt11char_traitsIcEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3280' is-artificial='yes'/>
-            <return type-id='type-id-3281'/>
+            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <return type-id='type-id-3280'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ofstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3280' is-artificial='yes'/>
+            <parameter type-id='type-id-3279' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48207,7 +48206,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE4openERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48215,13 +48214,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48229,7 +48228,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48237,7 +48236,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48247,7 +48246,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48257,7 +48256,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48267,7 +48266,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48277,7 +48276,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48285,7 +48284,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48293,7 +48292,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48301,24 +48300,24 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIcSt11char_traitsIcEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3279' is-artificial='yes'/>
+            <parameter type-id='type-id-3278' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_ifstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='420' column='1' id='type-id-3282'>
+      <class-decl name='basic_ifstream&lt;char, std::char_traits&lt;char&gt; &gt;' size-in-bits='4160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='420' column='1' id='type-id-3281'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-282'/>
         <member-type access='private'>
-          <typedef-decl name='__filebuf_type' type-id='type-id-379' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='431' column='1' id='type-id-3283'/>
+          <typedef-decl name='__filebuf_type' type-id='type-id-379' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='431' column='1' id='type-id-3282'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_filebuf' type-id='type-id-3283' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='435' column='1'/>
+          <var-decl name='_M_filebuf' type-id='type-id-3282' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='435' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48326,7 +48325,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48336,7 +48335,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48346,25 +48345,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt14basic_ifstreamIcSt11char_traitsIcEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ifstreamIcSt11char_traitsIcEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3285' is-artificial='yes'/>
-            <return type-id='type-id-3286'/>
+            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <return type-id='type-id-3285'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ifstreamIcSt11char_traitsIcEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3285' is-artificial='yes'/>
+            <parameter type-id='type-id-3284' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openEPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48372,7 +48371,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE4openERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48380,13 +48379,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='569' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48394,7 +48393,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48402,7 +48401,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48412,7 +48411,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48422,7 +48421,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48432,7 +48431,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48442,7 +48441,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48450,7 +48449,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48458,7 +48457,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48466,24 +48465,24 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIcSt11char_traitsIcEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3284' is-artificial='yes'/>
+            <parameter type-id='type-id-3283' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_fstream&lt;wchar_t, std::char_traits&lt;wchar_t&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-3287'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2718'/>
+      <class-decl name='basic_fstream&lt;wchar_t, std::char_traits&lt;wchar_t&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-3286'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-2717'/>
         <member-type access='private'>
-          <typedef-decl name='__filebuf_type' type-id='type-id-405' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='772' column='1' id='type-id-3288'/>
+          <typedef-decl name='__filebuf_type' type-id='type-id-405' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='772' column='1' id='type-id-3287'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='192'>
-          <var-decl name='_M_filebuf' type-id='type-id-3288' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='777' column='1'/>
+          <var-decl name='_M_filebuf' type-id='type-id-3287' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='777' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48491,7 +48490,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48501,7 +48500,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48511,25 +48510,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt13basic_fstreamIwSt11char_traitsIwEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='842' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt13basic_fstreamIwSt11char_traitsIwEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3290' is-artificial='yes'/>
-            <return type-id='type-id-3291'/>
+            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <return type-id='type-id-3290'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt13basic_fstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='856' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3290' is-artificial='yes'/>
+            <parameter type-id='type-id-3289' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEE4openEPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='871' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEE4openEPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48537,7 +48536,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEE4openERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEE4openERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48545,13 +48544,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48559,7 +48558,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48567,7 +48566,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48577,7 +48576,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48587,7 +48586,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48597,7 +48596,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48607,7 +48606,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48615,7 +48614,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48623,7 +48622,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48631,24 +48630,24 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_fstream' mangled-name='_ZNSt13basic_fstreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt13basic_fstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3289' is-artificial='yes'/>
+            <parameter type-id='type-id-3288' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </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-3292'>
-        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-774'/>
+      <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-3291'>
+        <base-class access='public' layout-offset-in-bits='0' type-id='type-id-775'/>
         <member-type access='private'>
-          <typedef-decl name='__filebuf_type' type-id='type-id-405' 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-3293'/>
+          <typedef-decl name='__filebuf_type' type-id='type-id-405' 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-3292'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='64'>
-          <var-decl name='_M_filebuf' type-id='type-id-3293' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='603' column='1'/>
+          <var-decl name='_M_filebuf' type-id='type-id-3292' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='603' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48656,7 +48655,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48666,7 +48665,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48676,25 +48675,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt14basic_ofstreamIwSt11char_traitsIwEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='673' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ofstreamIwSt11char_traitsIwEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3295' is-artificial='yes'/>
-            <return type-id='type-id-3296'/>
+            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <return type-id='type-id-3295'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ofstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='687' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3295' is-artificial='yes'/>
+            <parameter type-id='type-id-3294' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE4openEPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE4openEPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48702,7 +48701,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE4openERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE4openERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48710,13 +48709,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48724,7 +48723,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='614' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48732,7 +48731,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48742,7 +48741,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48752,7 +48751,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48762,7 +48761,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48772,7 +48771,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48780,7 +48779,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48788,7 +48787,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48796,24 +48795,24 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ofstream' mangled-name='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='662' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ofstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3294' is-artificial='yes'/>
+            <parameter type-id='type-id-3293' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
       </class-decl>
-      <class-decl name='basic_ifstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='4160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='420' column='1' id='type-id-3297'>
+      <class-decl name='basic_ifstream&lt;wchar_t, std::char_traits&lt;wchar_t&gt; &gt;' size-in-bits='4160' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='420' column='1' id='type-id-3296'>
         <base-class access='public' layout-offset-in-bits='0' type-id='type-id-321'/>
         <member-type access='private'>
-          <typedef-decl name='__filebuf_type' type-id='type-id-405' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='431' column='1' id='type-id-3298'/>
+          <typedef-decl name='__filebuf_type' type-id='type-id-405' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='431' column='1' id='type-id-3297'/>
         </member-type>
         <data-member access='private' layout-offset-in-bits='128'>
-          <var-decl name='_M_filebuf' type-id='type-id-3298' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='435' column='1'/>
+          <var-decl name='_M_filebuf' type-id='type-id-3297' visibility='default' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='435' column='1'/>
         </data-member>
         <member-function access='private'>
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48821,7 +48820,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48831,7 +48830,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48841,25 +48840,25 @@
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='rdbuf' mangled-name='_ZNKSt14basic_ifstreamIwSt11char_traitsIwEE5rdbufEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNKSt14basic_ifstreamIwSt11char_traitsIwEE5rdbufEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3300' is-artificial='yes'/>
-            <return type-id='type-id-3301'/>
+            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <return type-id='type-id-3300'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='is_open' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private' const='yes'>
           <function-decl name='is_open' mangled-name='_ZNKSt14basic_ifstreamIwSt11char_traitsIwEE7is_openEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='516' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3300' is-artificial='yes'/>
+            <parameter type-id='type-id-3299' is-artificial='yes'/>
             <return type-id='type-id-23'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE4openEPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE4openEPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48867,7 +48866,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='open' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE4openERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE4openERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
             <parameter type-id='type-id-51'/>
             <return type-id='type-id-4'/>
@@ -48875,13 +48874,13 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='close' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE5closeEv' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='569' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEE5closeEv@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <return type-id='type-id-4'/>
           </function-decl>
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48889,7 +48888,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48897,7 +48896,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48907,7 +48906,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1EPKcSt13_Ios_Openmode@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-11'/>
@@ -48917,7 +48916,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC2ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48927,7 +48926,7 @@
         </member-function>
         <member-function access='private'>
           <function-decl name='basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEEC1ERKSsSt13_Ios_Openmode@@GLIBCXX_3.4.13'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <parameter type-id='type-id-89'/>
@@ -48937,7 +48936,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48945,7 +48944,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED0Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED0Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48953,7 +48952,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED1Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED1Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48961,7 +48960,7 @@
         </member-function>
         <member-function access='private' destructor='yes' vtable-offset='-1'>
           <function-decl name='~basic_ifstream' mangled-name='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED2Ev' filepath='/tmp/legendre/spack-stage/spack-stage-wfh0ig/gcc-4.7.4/x86_64-unknown-linux-gnu/libstdc++-v3/include/fstream' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_ZNSt14basic_ifstreamIwSt11char_traitsIwEED2Ev@@GLIBCXX_3.4'>
-            <parameter type-id='type-id-3299' is-artificial='yes'/>
+            <parameter type-id='type-id-3298' is-artificial='yes'/>
             <parameter type-id='type-id-36' is-artificial='yes'/>
             <parameter type-id='type-id-304' is-artificial='yes'/>
             <return type-id='type-id-4'/>
@@ -48971,9 +48970,9 @@
     </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='84' column='1' id='type-id-3302'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='84' column='1' id='type-id-3301'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-3303'>
+        <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/wchar.h' line='87' column='1' id='type-id-3302'>
           <data-member access='private'>
             <var-decl name='__wch' type-id='type-id-502' visibility='default' filepath='/usr/include/wchar.h' line='89' column='1'/>
           </data-member>
@@ -48986,10 +48985,10 @@
         <var-decl name='__count' type-id='type-id-36' visibility='default' filepath='/usr/include/wchar.h' line='85' column='1'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-3303' visibility='default' filepath='/usr/include/wchar.h' line='94' column='1'/>
+        <var-decl name='__value' type-id='type-id-3302' visibility='default' filepath='/usr/include/wchar.h' line='94' column='1'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-3304'>
+    <union-decl name='__anonymous_union__' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='77' column='1' id='type-id-3303'>
       <data-member access='private'>
         <var-decl name='__data' type-id='type-id-1140' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='101' column='1'/>
       </data-member>
@@ -49000,43 +48999,43 @@
         <var-decl name='__align' type-id='type-id-55' visibility='default' filepath='/usr/include/bits/pthreadtypes.h' line='103' column='1'/>
       </data-member>
     </union-decl>
-    <qualified-type-def type-id='type-id-387' const='yes' id='type-id-3305'/>
-    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-3306'/>
-    <qualified-type-def type-id='type-id-412' const='yes' id='type-id-3307'/>
-    <qualified-type-def type-id='type-id-409' const='yes' id='type-id-3308'/>
-    <pointer-type-def type-id='type-id-3272' size-in-bits='64' id='type-id-3274'/>
-    <pointer-type-def type-id='type-id-3273' size-in-bits='64' id='type-id-3276'/>
-    <qualified-type-def type-id='type-id-3272' const='yes' id='type-id-3309'/>
-    <pointer-type-def type-id='type-id-3309' size-in-bits='64' id='type-id-3275'/>
-    <pointer-type-def type-id='type-id-3277' size-in-bits='64' id='type-id-3279'/>
-    <pointer-type-def type-id='type-id-3278' size-in-bits='64' id='type-id-3281'/>
-    <qualified-type-def type-id='type-id-3277' const='yes' id='type-id-3310'/>
-    <pointer-type-def type-id='type-id-3310' size-in-bits='64' id='type-id-3280'/>
-    <pointer-type-def type-id='type-id-3282' size-in-bits='64' id='type-id-3284'/>
-    <pointer-type-def type-id='type-id-3283' size-in-bits='64' id='type-id-3286'/>
-    <qualified-type-def type-id='type-id-3282' const='yes' id='type-id-3311'/>
-    <pointer-type-def type-id='type-id-3311' size-in-bits='64' id='type-id-3285'/>
-    <pointer-type-def type-id='type-id-3287' size-in-bits='64' id='type-id-3289'/>
-    <pointer-type-def type-id='type-id-3288' size-in-bits='64' id='type-id-3291'/>
-    <qualified-type-def type-id='type-id-3287' const='yes' id='type-id-3312'/>
-    <pointer-type-def type-id='type-id-3312' size-in-bits='64' id='type-id-3290'/>
-    <pointer-type-def type-id='type-id-3292' size-in-bits='64' id='type-id-3294'/>
-    <pointer-type-def type-id='type-id-3293' size-in-bits='64' id='type-id-3296'/>
-    <qualified-type-def type-id='type-id-3292' const='yes' id='type-id-3313'/>
-    <pointer-type-def type-id='type-id-3313' size-in-bits='64' id='type-id-3295'/>
-    <pointer-type-def type-id='type-id-3297' size-in-bits='64' id='type-id-3299'/>
-    <pointer-type-def type-id='type-id-3298' size-in-bits='64' id='type-id-3301'/>
-    <qualified-type-def type-id='type-id-3297' const='yes' id='type-id-3314'/>
-    <pointer-type-def type-id='type-id-3314' size-in-bits='64' id='type-id-3300'/>
+    <qualified-type-def type-id='type-id-387' const='yes' id='type-id-3304'/>
+    <qualified-type-def type-id='type-id-384' const='yes' id='type-id-3305'/>
+    <qualified-type-def type-id='type-id-412' const='yes' id='type-id-3306'/>
+    <qualified-type-def type-id='type-id-409' const='yes' id='type-id-3307'/>
+    <pointer-type-def type-id='type-id-3271' size-in-bits='64' id='type-id-3273'/>
+    <pointer-type-def type-id='type-id-3272' size-in-bits='64' id='type-id-3275'/>
+    <qualified-type-def type-id='type-id-3271' const='yes' id='type-id-3308'/>
+    <pointer-type-def type-id='type-id-3308' size-in-bits='64' id='type-id-3274'/>
+    <pointer-type-def type-id='type-id-3276' size-in-bits='64' id='type-id-3278'/>
+    <pointer-type-def type-id='type-id-3277' size-in-bits='64' id='type-id-3280'/>
+    <qualified-type-def type-id='type-id-3276' const='yes' id='type-id-3309'/>
+    <pointer-type-def type-id='type-id-3309' size-in-bits='64' id='type-id-3279'/>
+    <pointer-type-def type-id='type-id-3281' size-in-bits='64' id='type-id-3283'/>
+    <pointer-type-def type-id='type-id-3282' size-in-bits='64' id='type-id-3285'/>
+    <qualified-type-def type-id='type-id-3281' const='yes' id='type-id-3310'/>
+    <pointer-type-def type-id='type-id-3310' size-in-bits='64' id='type-id-3284'/>
+    <pointer-type-def type-id='type-id-3286' size-in-bits='64' id='type-id-3288'/>
+    <pointer-type-def type-id='type-id-3287' size-in-bits='64' id='type-id-3290'/>
+    <qualified-type-def type-id='type-id-3286' const='yes' id='type-id-3311'/>
+    <pointer-type-def type-id='type-id-3311' size-in-bits='64' id='type-id-3289'/>
+    <pointer-type-def type-id='type-id-3291' size-in-bits='64' id='type-id-3293'/>
+    <pointer-type-def type-id='type-id-3292' size-in-bits='64' id='type-id-3295'/>
+    <qualified-type-def type-id='type-id-3291' const='yes' id='type-id-3312'/>
+    <pointer-type-def type-id='type-id-3312' size-in-bits='64' id='type-id-3294'/>
+    <pointer-type-def type-id='type-id-3296' size-in-bits='64' id='type-id-3298'/>
+    <pointer-type-def type-id='type-id-3297' size-in-bits='64' id='type-id-3300'/>
+    <qualified-type-def type-id='type-id-3296' const='yes' id='type-id-3313'/>
+    <pointer-type-def type-id='type-id-3313' size-in-bits='64' id='type-id-3299'/>
 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/string-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++11' language='LANG_C_plus_plus'>
     <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-778'>
+      <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-779'>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-447' 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-3315'/>
+          <typedef-decl name='iterator_category' type-id='type-id-447' 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-3314'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-441' 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-207'/>
@@ -49050,12 +49049,12 @@
       </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'>
         <parameter type-id='type-id-2343'/>
-        <return type-id='type-id-3315'/>
+        <return type-id='type-id-3314'/>
       </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='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-160'/>
         <parameter type-id='type-id-160'/>
-        <parameter type-id='type-id-783'/>
+        <parameter type-id='type-id-784'/>
         <return type-id='type-id-207'/>
       </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'>
@@ -49078,7 +49077,7 @@
         <parameter type-id='type-id-181'/>
         <return type-id='type-id-146'/>
       </function-decl>
-      <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-779'>
+      <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-780'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-454' 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-195'/>
         </member-type>
@@ -49101,18 +49100,18 @@
         <return type-id='type-id-23'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-177' const='yes' id='type-id-3316'/>
-    <qualified-type-def type-id='type-id-147' const='yes' id='type-id-3317'/>
-    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-3318'/>
+    <qualified-type-def type-id='type-id-177' const='yes' id='type-id-3315'/>
+    <qualified-type-def type-id='type-id-147' const='yes' id='type-id-3316'/>
+    <qualified-type-def type-id='type-id-154' const='yes' id='type-id-3317'/>
 
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../../.././libstdc++-v3/src/c++11/wstring-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++11' language='LANG_C_plus_plus'>
     <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-781'>
+      <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-782'>
         <member-type access='public'>
-          <typedef-decl name='iterator_category' type-id='type-id-478' 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-3319'/>
+          <typedef-decl name='iterator_category' type-id='type-id-478' 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-3318'/>
         </member-type>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-472' 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-273'/>
@@ -49126,12 +49125,12 @@
       </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'>
         <parameter type-id='type-id-2557'/>
-        <return type-id='type-id-3319'/>
+        <return type-id='type-id-3318'/>
       </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='90' column='1' visibility='default' binding='global' size-in-bits='64'>
         <parameter type-id='type-id-229'/>
         <parameter type-id='type-id-229'/>
-        <parameter type-id='type-id-783'/>
+        <parameter type-id='type-id-784'/>
         <return type-id='type-id-273'/>
       </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'>
@@ -49154,7 +49153,7 @@
         <parameter type-id='type-id-250'/>
         <return type-id='type-id-216'/>
       </function-decl>
-      <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-780'>
+      <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-781'>
         <member-type access='public'>
           <typedef-decl name='difference_type' type-id='type-id-485' 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-261'/>
         </member-type>
@@ -49177,9 +49176,9 @@
         <return type-id='type-id-23'/>
       </function-decl>
     </namespace-decl>
-    <qualified-type-def type-id='type-id-245' const='yes' id='type-id-3320'/>
-    <qualified-type-def type-id='type-id-217' const='yes' id='type-id-3321'/>
-    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-3322'/>
+    <qualified-type-def type-id='type-id-245' const='yes' id='type-id-3319'/>
+    <qualified-type-def type-id='type-id-217' const='yes' id='type-id-3320'/>
+    <qualified-type-def type-id='type-id-223' const='yes' id='type-id-3321'/>
 
   </abi-instr>
 </abi-corpus>

diff --git a/tests/test-diff-filter.cc b/tests/test-diff-filter.cc
index 31298cf..c05928f 100644 (file)
--- a/tests/test-diff-filter.cc
+++ b/tests/test-diff-filter.cc
@@ -542,6 +542,13 @@ InOutSpec in_out_specs[] =
     "data/test-diff-filter/test47-filter-void-ptr-change-report-0.txt",
     "output/test-diff-filter/test47-filter-void-ptr-change-report-0.txt",
   },
+  {
+    "data/test-diff-filter/PR24430-fold-qualified-array-clang",
+    "data/test-diff-filter/PR24430-fold-qualified-array-gcc",
+    "--no-default-suppression",
+    "data/test-diff-filter/PR24430-fold-qualified-array-report-0.txt",
+    "output/test-diff-filter/PR24430-fold-qualified-array-report-0.txt",
+  },
   // This should be the last entry
   {NULL, NULL, NULL, NULL, NULL}
 };